fixes

Author: Vivswan

main.py

@@ -6,7 +6,7 @@
 from unit_tests import test_codes
 
 if __name__ == '__main__':
-    for test_case in [0]:
+    for test_case in [1]:
         print()
         str_result = f"Running Test Case {test_case}...\n"
         code = test_codes[test_case]

requirements.txt

@@ -1 +0,0 @@
-python-docx

src/computation_units/memory.py

@@ -155,10 +155,10 @@ def print_str_tables(self):
             if v != 0:
                 i_str = f"{i * 4}".zfill(math.ceil(math.log10(len(self.data) * 4)))
                 v_str = v if v == int(v) else f"{v:0.2f}"
-                str_result += f"{i_str}: {v_str}".ljust(10)
+                str_result += f"{i_str}: {v_str}".ljust(14)
                 count += 1
 
-            if count % 16 == 0:
+            if count % 12 == 0:
                 str_result += "\n"
 
         str_result += "\n"

src/instruction/instruction.py

@@ -97,6 +97,7 @@ def print_str_instructions(instructions: List[Instruction]):
             "Instruction",
             *StageEvent.rows,
             "Result",
+            "Prediction",
             "Operands",
         ]
     ]
@@ -109,7 +110,8 @@ def print_str_instructions(instructions: List[Instruction]):
             v.index,
             v.instruction,
             *v.stage_event.print_str(),
-            v.result,
+            v.result if not isinstance(v.result, float) else f"{v.result:.4f}",
+            v.related_data["branch_jump"] if v.type is InstructionType.BNE else "",
             v.operands if v.execution else "",
         ]
         strike_row.append(v.execution)
@@ -120,7 +122,7 @@ def print_str_instructions(instructions: List[Instruction]):
     for i in rows:
         for j, v in enumerate(i):
             if lengths[j] < len(str(v)):
-                lengths[j] = len(str(v)) + 6
+                lengths[j] = len(str(v)) + 5
 
     lengths[0] = 2
     lengths[rows[0].index("Instruction")] += 6

src/tomasulo.py

@@ -216,14 +216,15 @@ def check_asserts(self) -> Tuple[bool, List[AssertResult]]:
 
             if value is None:
                 value = self.rat.get(check_key, raise_error=False)
-            if value is None:
-                value = self.memory_unit.get_value(check_key)
+            if value is None and "mem[" in check_key.lower():
+                key = int(check_key.lower()[4:-1])
+                value = self.memory_unit.get_value(key)
 
             append_value = AssertResult(
-                result=check_value == str(value),
+                result=f"{float(check_value):.4f}" == f"{value:.4f}",
                 key=check_key,
                 check_value=check_value,
-                value=str(value)
+                value=f"{value:.4f}" if isinstance(value, float) else str(value)
             )
             assert_list.append(append_value)
         return all(i.result for i in assert_list), assert_list

unit_tests/test_0.txt

@@ -13,3 +13,14 @@ SUBI R4, R4, 1
 LD R3, 4(R0)
 SD R3, 4(R0)
 
+
+$ Mem[0] = 5
+
+! R2 = 5
+
+# THis is Test Case 1 for Functionality
+LD R1 0(R1)
+Loop1: ADDI R2, R2, 1
+BNE R1, R2, Loop1
+ADDI R1, R1, 5
+

unit_tests/test_1.txt

@@ -1,9 +1,43 @@
-$ Mem[0] = 5
+# Straight-line base cases where no dependencies exist among instructions
 
-! R2 = 5
+$ Mem[4] = 2.3
 
-# THis is Test Case 1 for Functionality
-LD R1 0(R1)
-Loop1: ADDI R2, R2, 1
-BNE R1, R2, Loop1
-ADDI R1, R1, 5
+$ R1 = 4
+$ R2 = 20
+$ R3 = 12
+$ R4 = 9
+$ R5 = 13
+$ R6 = 8
+$ R7 = 5
+$ R8 = 9
+
+$ F2 = 7.3
+$ F3 = 1.8
+$ F4 = 3.5
+$ F5 = 4.6
+$ F6 = 4.5
+$ F7 = 1.5
+$ F8 = 2.5
+
+! F1 = 2.3
+! MEM[20] = 7.3
+! R9 = 21
+! R10 = 5
+! R11 = 3
+! R12 = 1
+! F9 = 5.3
+! F10 = 0.1
+! F11 = 3.75
+
+LD F1, 0 (R1)
+SD F2, 0 (R2)
+
+ADD R9, R3, R4
+ADDI R10, R5, -8
+SUB R11, R6, R7
+SUBI R12, R8, 8
+
+ADDD F9, F3, F4
+SUBD F10, F5, F6
+
+MULTD F11, F7, F8

unit_tests/test_2.txt

@@ -1,9 +1,11 @@
+# Straight-line code where there are dependencies (true and false)
 
+$F4 = 8.14
+$F3 = 6.86
+$R1 = 4
 
-
-# Straight-line code where there are dependencies (true and false)
 LD   F0, 0 (R1)
-DIVD F2, F0, F4
+MULTD F2, F0, F4
 ADDD F1, F0, F3
 
 #Write-After-Read (WAR: anti-dependence) on F3

unit_tests/test_3.txt

@@ -1,9 +1,20 @@
 # straight-line code where there are forwarding among load/store instructions
 
+$ F2 = 10
+$ R1 = 4
+$ R2 = 8
+
 LD F4, 0(R1)
+#Get value from memory
 MULTD F1, F4, F2
+SD F1, 0(R2)
 LD F3, 0(R2)
-SUB F3, F1, F3
+#Get the calculated value of F1 due to SD instruction
+LD F5, 4(R2)
+#Get value from memory
+SUB F3, F3, F5
 SD F3, 0(R2)
-ADDI R1, R1, 8
-ADDI R2, R2, 8
+LD F6, 0(R2)
+#Get the calculated value of F3 due to SD instruction
+MULTD F6, F6, F6
+SD F6, 0(R1)

unit_tests/test_4.txt

@@ -1,9 +1,14 @@
 #straight-line code where there are structure hazards in reservation stations and functional unit
 
+$ F4 = 16.5
+$ F5 = 4.28
+$ F6 = 2.00
+
 LD F6, 0 (R1)
 MULTD F2, F3, F4
 MULTD F1, F5, F5
 SD F2, 0(R2)
-DIVD F1, F1, F6
+MULTD F1, F1, F6
+# 2 reservation stations for FP multiplier, 3rd MULTD must wait
 ADDD F5, F4, F1
 SD F5, 0(R1)

unit_tests/test_5.txt

@@ -1,11 +1,16 @@
 # simple loop on top of either 1), 2), 3), or 4), or all of them
 
+$ R1 = 4
+$ R2 = 12
+
+#! cycle = 4
+
 Loop: LD F1, 0(R1)
 LD F2, 0(R2)
-DIVD F3,F1,F2
+MULTD F3,F1,F2
 ADDD F4,F1,F2
-SD F3, 3(R1)
-SD F4, 4(R1)
+SD F3, 4(R1)
+SD F4, 8(R1)
 ADD R3,R2,R1
-SUBI R2,R2,-8
-BNE R2,R3, Loop
+SUBI R2,R2,4
+BNE R2,R1, Loop

unit_tests/test_6.txt

@@ -2,12 +2,14 @@
 
 $R1 = 20
 $R2 = 8
-$F3 = 10
+$F3 = 10.5
 
 Loop: LD F1, 0(R1)
 MULTD F2, F1, F3
 ADDD F4, F1, F2
 ADDI R1, R1, -4
 BNE R1, R2, Loop
+
 SUB F6, F4, F3
-SD F6, 0(R2)
+SD F6, 0(R2)
+