Fix correct generation of ROM graphs (5f210405) · Commits · IVAS Codec Public Collaboration / IVAS Codec

ci/complexity_measurements/genWebpageData_Rom.csh

+72 −40

Original line number	Diff line number	Diff line
		@@ -45,7 +45,7 @@ set tmpFile = /tmp/${tmpBase}_$$
		rm -f ${tmpFile}
		cat ${srcFile} \| tail -n ${maxValues} > ${tmpFile}
		set nLines = `cat ${tmpFile} \| wc -l`
		set maxNumWordsLine = 19
		set maxNumWordsLine = 21

		rm -f $file
		touch $file
		@@ -71,27 +71,59 @@ foreach line ( "`cat ${tmpFile}`" )
		continue
		endif


		# 1 revision,
		# 2 shortDate,
		# 3 fullDate,

		# 4 max_total_encdec[1],

		# 5 max_prom_enc[0],
		# 6 max_prom_enc[1],
		# 7 max_prom_dec[0],
		# 8 max_prom_dec[1],
		# 9 max_prom_com[0],
		# 10 max_prom_com[1],
		# 11 max_prom_rend[0],
		# 12 max_prom_rend[1],

		# 13 max_trom_enc[0],
		# 14 max_trom_enc[1],
		# 15 max_trom_dec[0],
		# 16 max_trom_dec[1],
		# 17 max_trom_com[0],
		# 18 max_trom_com[1],
		# 19 max_trom_rend[0],
		# 20 max_trom_rend[1],

		# 21 newsletterFilenameLast,


		set revision = $tmp[1]
		set shortDate = `echo $tmp[2] \| sed -e "s/_/\ /g"`
		set fullDate = `echo $tmp[3] \| sed -e "s/_/\ /g"`
		set TotalRomEnc = $tmp[5]
		set TotalRomDec = $tmp[7]
		set PromEnc = $tmp[10]
		set PromDec = $tmp[12]
		set TromEnc = $tmp[15]
		set TromDec = $tmp[17]
		set logFile = $tmp[19]
		set PromEnc = $tmp[5]
		set PromDec = $tmp[7]
		set PromCom = $tmp[9]
		set PromRend = $tmp[11]
		set TromEnc = $tmp[13]
		set TromDec = $tmp[15]
		set TromCom = $tmp[17]
		set TromRend = $tmp[19]
		set logFile = $tmp[21]

		echo ' {' >> $file
		echo ' fullDate: "'${fullDate}'",' >> $file
		echo ' shortDate: "'${shortDate}'",' >> $file
		echo ' revision: "'${revision}'",' >> $file
		echo ' TotalRomEnc: "'${TotalRomEnc}'",' >> $file
		echo ' TotalRomDec: "'${TotalRomDec}'",' >> $file
		echo ' PromEnc: "'${PromEnc}'",' >> $file
		echo ' PromDec: "'${PromDec}'",' >> $file
		echo ' PromCom: "'${PromCom}'",' >> $file
		echo ' PromRend: "'${PromRend}'",' >> $file
		echo ' TromEnc: "'${TromEnc}'",' >> $file
		echo ' TromDec: "'${TromDec}'",' >> $file
		echo ' TromCom: "'${TromCom}'",' >> $file
		echo ' TromRend: "'${TromRend}'",' >> $file
		echo ' logFile: "'${logFile}'"' >> $file
		echo ' }'${separator} >> $file

		@@ -180,7 +212,7 @@ echo ' ]' >> $file
		echo ' },' >> $file
		# TotalRomCodecScore

		# TotalRomEncScore
		# maxPROMEncScore
		echo ' {' >> $file
		echo ' lines: { show: true },' >> $file
		echo ' points: { show: true, fillColor: "#ffffff" },' >> $file
		@@ -191,7 +223,7 @@ echo ' hoverable: true,' >> $file
		echo ' clickable: true,' >> $file
		echo ' shadowSize: 0,' >> $file
		echo ' color: "#FF8000",' >> $file
		echo ' id: "TotalRomEncScore",' >> $file
		echo ' id: "maxPROMEncScore",' >> $file
		echo ' data: [' >> $file

		@ i = 0
		@@ -217,9 +249,9 @@ end

		echo ' ]' >> $file
		echo ' },' >> $file
		# TotalRomEncScore
		# maxPROMEncScore

		# TotalRomDecScore
		# maxPROMDecScore
		echo ' {' >> $file
		echo ' lines: { show: true },' >> $file
		echo ' points: { show: true, fillColor: "#ffffff" },' >> $file
		@@ -230,7 +262,7 @@ echo ' hoverable: true,' >> $file
		echo ' clickable: true,' >> $file
		echo ' shadowSize: 0,' >> $file
		echo ' color: "#FFFF00",' >> $file
		echo ' id: "TotalRomDecScore",' >> $file
		echo ' id: "maxPROMDecScore",' >> $file
		echo ' data: [' >> $file

		@ i = 0
		@@ -256,9 +288,9 @@ end

		echo ' ]' >> $file
		echo ' },' >> $file
		# TotalRomDecScore
		# maxPROMEncScore

		# PROMCodecScore
		# maxPROMComScore
		echo ' {' >> $file
		echo ' lines: { show: true },' >> $file
		echo ' points: { show: true, fillColor: "#ffffff" },' >> $file
		@@ -269,7 +301,7 @@ echo ' hoverable: true,' >> $file
		echo ' clickable: true,' >> $file
		echo ' shadowSize: 0,' >> $file
		echo ' color: "#004000",' >> $file
		echo ' id: "PROMCodecScore",' >> $file
		echo ' id: "maxPROMComScore",' >> $file
		echo ' data: [' >> $file

		@ i = 0
		@@ -286,7 +318,7 @@ foreach line ( "`cat ${tmpFile}`" )
		continue
		endif

		set score = $tmp[9]
		set score = $tmp[10]

		echo ' ['"${i}, ${score}"']'${separator} >> $file
		@ i++
		@@ -295,10 +327,10 @@ end

		echo ' ]' >> $file
		echo ' },' >> $file
		# PROMCodecScore
		# maxPROMComScore


		# PROMEncScore
		# maxPROMRendScore
		echo ' {' >> $file
		echo ' lines: { show: true },' >> $file
		echo ' points: { show: true, fillColor: "#ffffff" },' >> $file
		@@ -309,7 +341,7 @@ echo ' hoverable: true,' >> $file
		echo ' clickable: true,' >> $file
		echo ' shadowSize: 0,' >> $file
		echo ' color: "#008000",' >> $file
		echo ' id: "PROMEncScore",' >> $file
		echo ' id: "maxPROMRendScore",' >> $file
		echo ' data: [' >> $file

		@ i = 0
		@@ -326,7 +358,7 @@ foreach line ( "`cat ${tmpFile}`" )
		continue
		endif

		set score = $tmp[11]
		set score = $tmp[12]

		echo ' ['"${i}, ${score}"']'${separator} >> $file
		@ i++
		@@ -335,9 +367,9 @@ end

		echo ' ]' >> $file
		echo ' },' >> $file
		# PROMEncScore
		# maxPROMRendScore

		# PROMDecScore
		# maxTROMEncScore
		echo ' {' >> $file
		echo ' lines: { show: true },' >> $file
		echo ' points: { show: true, fillColor: "#ffffff" },' >> $file
		@@ -348,7 +380,7 @@ echo ' hoverable: true,' >> $file
		echo ' clickable: true,' >> $file
		echo ' shadowSize: 0,' >> $file
		echo ' color: "#00FF00",' >> $file
		echo ' id: "PROMDecScore",' >> $file
		echo ' id: "maxTROMEncScore",' >> $file
		echo ' data: [' >> $file

		@ i = 0
		@@ -365,7 +397,7 @@ foreach line ( "`cat ${tmpFile}`" )
		continue
		endif

		set score = $tmp[13]
		set score = $tmp[14]

		echo ' ['"${i}, ${score}"']'${separator} >> $file
		@ i++
		@@ -374,9 +406,9 @@ end

		echo ' ]' >> $file
		echo ' },' >> $file
		# PROMDecScore
		# maxTROMEncScore

		# TROMCodecScore
		# maxTROMDecScore
		echo ' {' >> $file
		echo ' lines: { show: true },' >> $file
		echo ' points: { show: true, fillColor: "#ffffff" },' >> $file
		@@ -387,7 +419,7 @@ echo ' hoverable: true,' >> $file
		echo ' clickable: true,' >> $file
		echo ' shadowSize: 0,' >> $file
		echo ' color: "#800080",' >> $file
		echo ' id: "TROMCodecScore",' >> $file
		echo ' id: "maxTROMDecScore",' >> $file
		echo ' data: [' >> $file

		@ i = 0
		@@ -404,7 +436,7 @@ foreach line ( "`cat ${tmpFile}`" )
		continue
		endif

		set score = $tmp[14]
		set score = $tmp[16]

		echo ' ['"${i}, ${score}"']'${separator} >> $file
		@ i++
		@@ -413,9 +445,9 @@ end

		echo ' ]' >> $file
		echo ' },' >> $file
		# TROMCodecScore
		# maxTROMDecScore

		# TROMEncScore
		# maxTROMComScore
		echo ' {' >> $file
		echo ' lines: { show: true },' >> $file
		echo ' points: { show: true, fillColor: "#ffffff" },' >> $file
		@@ -426,7 +458,7 @@ echo ' hoverable: true,' >> $file
		echo ' clickable: true,' >> $file
		echo ' shadowSize: 0,' >> $file
		echo ' color: "#0000FF",' >> $file
		echo ' id: "TROMEncScore",' >> $file
		echo ' id: "maxTROMComScore",' >> $file
		echo ' data: [' >> $file

		@ i = 0
		@@ -443,7 +475,7 @@ foreach line ( "`cat ${tmpFile}`" )
		continue
		endif

		set score = $tmp[16]
		set score = $tmp[18]

		echo ' ['"${i}, ${score}"']'${separator} >> $file
		@ i++
		@@ -452,9 +484,9 @@ end

		echo ' ]' >> $file
		echo ' },' >> $file
		# TROMEncScore
		# maxTROMComScore

		# TROMDecScore
		# maxTROMRendScore
		echo ' {' >> $file
		echo ' lines: { show: true },' >> $file
		echo ' points: { show: true, fillColor: "#ffffff" },' >> $file
		@@ -465,7 +497,7 @@ echo ' hoverable: true,' >> $file
		echo ' clickable: true,' >> $file
		echo ' shadowSize: 0,' >> $file
		echo ' color: "#0080C0",' >> $file
		echo ' id: "TROMDecScore",' >> $file
		echo ' id: "maxTROMRendScore",' >> $file
		echo ' data: [' >> $file

		@ i = 0
		@@ -482,7 +514,7 @@ foreach line ( "`cat ${tmpFile}`" )
		continue
		endif

		set score = $tmp[18]
		set score = $tmp[20]

		echo ' ['"${i}, ${score}"']'${separator} >> $file
		@ i++
		@@ -491,7 +523,7 @@ end

		echo ' ]' >> $file
		echo ' }' >> $file
		# TROMDecScore
		# maxTROMRendScore

		echo ' ]' >> $file
		# end displays

ci/complexity_measurements/parseNewsletterRam.py

+21 −22

Original line number	Diff line number	Diff line
		@@ -133,31 +133,30 @@ for key in ram_table:
		max_total_encdec[0] = re.sub(" ", "_", key)
		max_total_encdec[1] = total_encdec


		print(
		revision,
		shortDate,
		fullDate,

		max_total_encdec[1],

		max_total_enc[0],
		max_total_enc[1],
		max_total_dec[0],
		max_total_dec[1],

		max_stack_encdec[1],
		max_stack_encdec[0],
		max_stack_enc[0],
		max_stack_enc[1],
		max_stack_dec[0],
		max_stack_dec[1],

		max_heap_encdec[0],
		max_heap_encdec[1],
		max_heap_enc[0],
		max_heap_enc[1],
		max_heap_dec[0],
		max_heap_dec[1],

		newsletterFilenameLast,
		revision, # string revision $tmp[1]
		shortDate, # string shortDate $tmp[2]
		fullDate, # string fullDate $tmp[3]

		max_total_encdec[1], # value maxTotalRamCodecScore $tmp[4]

		max_total_enc[0], # string maxTotalRamEnc $tmp[5]
		max_total_enc[1], # value maxTotalRamEnc $tmp[6]
		max_total_dec[0], # string maxTotalRamDec $tmp[7]
		max_total_dec[1], # value maxTotalRamDecScore $tmp[8]

		max_stack_encdec[1], # value maxStackCodecScore $tmp[9]
		max_stack_enc[0], # string maxStackEnc $tmp[10]
		max_stack_enc[1], # value maxStackEncScore $tmp[11]
		max_stack_dec[0], # string maxStackDec $tmp[12]
		max_stack_dec[1], # value maxStackDecScore $tmp[13]

		max_heap_encdec[1], # value maxHeapCodecScore $tmp[14]
		max_heap_enc[0], # string maxHeapEnc $tmp[15]
		max_heap_enc[1], # value maxHeapEncScore $tmp[16]
		max_heap_dec[0], # string maxHeapDec $tmp[17]
		max_heap_dec[1], # value maxHeapDecScore $tmp[19]

		newsletterFilenameLast, # string logFile $tmp[19]
		)

ci/complexity_measurements/parseNewsletterRom.py

+25 −26

Original line number	Diff line number	Diff line
		@@ -139,31 +139,30 @@ for key in rom_table:
		max_total_encdec[1] = total_encdec



		print(
		revision,
		shortDate,
		fullDate,

		max_total_encdec[1],

		max_prom_enc[0],
		max_prom_enc[1],
		max_prom_dec[0],
		max_prom_dec[1],
		max_prom_com[0],
		max_prom_com[1],
		max_prom_rend[0],
		max_prom_rend[1],

		max_trom_enc[0],
		max_trom_enc[1],
		max_trom_dec[0],
		max_trom_dec[1],
		max_trom_com[0],
		max_trom_com[1],
		max_trom_rend[0],
		max_trom_rend[1],

		newsletterFilenameLast,
		revision, # string revision $tmp[1]
		shortDate, # string shortDate $tmp[2]
		fullDate, # string fullDate $tmp[3]

		max_total_encdec[1], # value maxTotalRomCodecScore $tmp[4]

		max_prom_enc[0], # string maxPROMEnc $tmp[5]
		max_prom_enc[1], # value maxPROMEncScore $tmp[6]
		max_prom_dec[0], # string maxPROMDec $tmp[7]
		max_prom_dec[1], # value maxPROMDecScore $tmp[8]
		max_prom_com[0], # string maxPROMCom $tmp[9]
		max_prom_com[1], # value maxPROMComScore $tmp[10]
		max_prom_rend[0], # string maxPROMRend $tmp[11]
		max_prom_rend[1], # value maxPROMRendScore $tmp[12]

		max_trom_enc[0], # string maxTROMEnc $tmp[13]
		max_trom_enc[1], # value maxTROMEncScore $tmp[14]
		max_trom_dec[0], # string maxTROMDec $tmp[15]
		max_trom_dec[1], # value maxTROMDecScore $tmp[16]
		max_trom_com[0], # string maxTROMCom $tmp[17]
		max_trom_com[1], # value maxTROMComScore $tmp[18]
		max_trom_rend[0], # string maxTROMRend $tmp[19]
		max_trom_rend[1], # value maxTROMRendScore $tmp[20]

		newsletterFilenameLast, # string logFile $tmp[21]
		)