Commit 31cf2a89 authored by Jan Kiene's avatar Jan Kiene
Browse files

fix indices for runs variable generation

parent d62723ca
Loading
Loading
Loading
Loading
+3 −6
Original line number Diff line number Diff line
@@ -47,9 +47,6 @@ RUNS_KEYS_WMOPS = RUNS_KEYS_COMMON + [
    "worstCaseEnc",
    "worstCaseDec",
    "worstCaseCodec",
    "worstCaseEncRs",
    "worstCaseDecRs",
    "worstCaseCodecRs",
    "fixpointScalingFac",
]
RUNS_KEYS_WMOPS_PER_OP = [
@@ -82,9 +79,9 @@ RUNS_KEYS = {
    "wmops_per_op": RUNS_KEYS_WMOPS_PER_OP,
}
RUNS_LINE_IDX = {
    "wmops": [2, 1, 0, 4, 6, 8, 12, 14, 16, 10, 18],
    "rom": [2, 1, 0, 4, 6, 8, 10, 12, 14, 16, 18, 20],
    "ram": [2, 1, 0, 4, 6, 9, 11, 14, 16, 18],
    "wmops": [2, 1, 0, 18, 4, 6, 8, 10],
    "rom": [2, 1, 0, 20, 4, 6, 8, 10, 12, 14, 16, 18],
    "ram": [2, 1, 0, 18, 4, 6, 9, 11, 14, 16],
    "wmops_per_op": [0, 4],
}

+25 −19
Original line number Diff line number Diff line
@@ -40,6 +40,12 @@ revision = ""
shortDate = ""
fullDate = ""

"""
The purpose of this script is to convert the csv file output from the IvasBuildAndRunChecks script
into a blank-space separated string which is then appended to an existing file obtained from the last
complexity pipeline run.
"""

if __name__ == "__main__":
    newsletterFilenameHEAP = sys.argv[1]
    newsletterFilenameSTACK = sys.argv[2]
@@ -135,23 +141,23 @@ for key in ram_table:


print(
    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]
    revision,  # string revision
    shortDate,  # string shortDate
    fullDate,  # string fullDate
    max_total_encdec[1],  # value maxTotalRamCodecScore
    max_total_enc[0],  # string maxTotalRamEnc
    max_total_enc[1],  # value maxTotalRamEnc
    max_total_dec[0],  # string maxTotalRamDec
    max_total_dec[1],  # value maxTotalRamDecScore
    max_stack_encdec[1],  # value maxStackCodecScore
    max_stack_enc[0],  # string maxStackEnc
    max_stack_enc[1],  # value maxStackEncScore
    max_stack_dec[0],  # string maxStackDec
    max_stack_dec[1],  # value maxStackDecScore
    max_heap_encdec[1],  # value maxHeapCodecScore
    max_heap_enc[0],  # string maxHeapEnc
    max_heap_enc[1],  # value maxHeapEncScore
    max_heap_dec[0],  # string maxHeapDec
    max_heap_dec[1],  # value maxHeapDecScore
    newsletterFilenameLast,  # string logFile
)
+27 −21
Original line number Diff line number Diff line
@@ -41,6 +41,12 @@ revision = ""
shortDate = ""
fullDate = ""

"""
The purpose of this script is to convert the csv file output from the IvasBuildAndRunChecks script
into a blank-space separated string which is then appended to an existing file obtained from the last
complexity pipeline run.
"""

if __name__ == "__main__":
    newsletterFilenamePROM = sys.argv[1]
    newsletterFilenameTROM = sys.argv[2]
@@ -140,25 +146,25 @@ for key in rom_table:


print(
    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]
    revision,  # string revision
    shortDate,  # string shortDate
    fullDate,  # string fullDate
    max_total_encdec[1],  # value maxTotalRomCodecScore
    max_prom_enc[0],  # string maxPROMEnc
    max_prom_enc[1],  # value maxPROMEncScore
    max_prom_dec[0],  # string maxPROMDec
    max_prom_dec[1],  # value maxPROMDecScore
    max_prom_com[0],  # string maxPROMCom
    max_prom_com[1],  # value maxPROMComScore
    max_prom_rend[0],  # string maxPROMRend
    max_prom_rend[1],  # value maxPROMRendScore
    max_trom_enc[0],  # string maxTROMEnc
    max_trom_enc[1],  # value maxTROMEncScore
    max_trom_dec[0],  # string maxTROMDec
    max_trom_dec[1],  # value maxTROMDecScore
    max_trom_com[0],  # string maxTROMCom
    max_trom_com[1],  # value maxTROMComScore
    max_trom_rend[0],  # string maxTROMRend
    max_trom_rend[1],  # value maxTROMRendScore
    newsletterFilenameLast,  # string logFile
)
+9 −0
Original line number Diff line number Diff line
@@ -40,6 +40,12 @@ revision = ""
shortDate = ""
fullDate = ""

"""
The purpose of this script is to convert the csv file output from the IvasBuildAndRunChecks script
into a blank-space separated string which is then appended to an existing file obtained from the last
complexity pipeline run.
"""

if __name__ == "__main__":
    newsletterFilename = sys.argv[1]
    newsletterFilenameLast = sys.argv[2]
@@ -67,6 +73,9 @@ with open(newsletterFilename, "r") as csvfile:
            max_total[0] = re.sub(" ", "_", row[0])
            max_total[1] = float(row[3])

# NOTE: there is a repetiion of some values here. This has historical reasons.
#       The repeated values are ignored in the later processing, but to not break the file format
#       this is kept as is.
print(
    revision,
    shortDate,