updated ci for ruff and formatted files accordingly

QDucasse · Nov 5, 2024 · 4a82084 · 4a82084
1 parent 08c7a90
commit 4a82084
Show file tree

Hide file tree

Showing 8 changed files with 507 additions and 450 deletions.
diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/gigue/rimi/rimi_builder.py b/gigue/rimi/rimi_builder.py
@@ -76,9 +76,7 @@ def build_epilogue(
         # need for RA!
         if contains_call:
             # Overwrite the RA load with a load from the shadow stack
-            instructions.insert(
-                -1, RIMIIInstruction.lst(rd=RA, rs1=RIMI_SSP_REG, imm=0)
-            )
+            instructions.insert(-1, RIMIIInstruction.lst(rd=RA, rs1=RIMI_SSP_REG, imm=0))
             # Insert the addi
             instructions.insert(
                 -1, IInstruction.addi(rd=RIMI_SSP_REG, rs1=RIMI_SSP_REG, imm=8)

diff --git a/gigue/trampoline.py b/gigue/trampoline.py
@@ -41,9 +41,7 @@ def build(self) -> List[Instruction]:
     # \__________
 
     def generate(self) -> List[int]:
-        self.machine_code = [
-            instruction.generate() for instruction in self.instructions
-        ]
+        self.machine_code = [instruction.generate() for instruction in self.instructions]
         return self.machine_code
 
     def generate_bytes(self) -> bytes:

diff --git a/tests/test_builder.py b/tests/test_builder.py
@@ -631,8 +631,7 @@ def test_build_epilogue_execution(
     current_pc = uc_emul.reg_read(UC_RISCV_REG_PC)
     assert (
         current_sp
-        == STACK_ADDRESS
-        + (used_s_regs + local_var_nb + (1 if contains_call else 0)) * 8
+        == STACK_ADDRESS + (used_s_regs + local_var_nb + (1 if contains_call else 0)) * 8
     )
     assert current_pc == called_address if contains_call else RET_ADDRESS
     uc_emul.emu_stop()

diff --git a/toccata/parser.py b/toccata/parser.py
@@ -94,9 +94,7 @@ def extract_from_dump(dump_file: str) -> DumpParsingData:
                         ret_address = int(line.split(":")[0], 16)
                         in_gigue_bin = False
             if start_address == -1:
-                raise MissingAddressException(
-                    "Start address was not found in the dump."
-                )
+                raise MissingAddressException("Start address was not found in the dump.")
             if end_address == -1:
                 raise MissingAddressException("End address was not found in the dump.")
             if ret_address == -1:

diff --git a/toccata/plotter.py b/toccata/plotter.py
@@ -342,9 +342,9 @@ def plot_all_call_nb_cycles(
                 call_positions[call_qualif]
                 + nb_methods_positions[app_data["nb_methods_qualif"]],
                 math.ceil(
-                    mean([
-                        nb_cycle for nb_cycle in app_data["nb_cycles"] if nb_cycle != 0
-                    ])
+                    mean(
+                        [nb_cycle for nb_cycle in app_data["nb_cycles"] if nb_cycle != 0]
+                    )
                 )
                 / 1000,
                 color="blue",
@@ -360,9 +360,9 @@ def plot_all_call_nb_cycles(
                 + nb_methods_positions[app_data["nb_methods_qualif"]]
                 + 0.25,
                 math.ceil(
-                    mean([
-                        nb_cycle for nb_cycle in app_data["nb_cycles"] if nb_cycle != 0
-                    ])
+                    mean(
+                        [nb_cycle for nb_cycle in app_data["nb_cycles"] if nb_cycle != 0]
+                    )
                 )
                 / 1000,
                 color="red",
@@ -457,9 +457,9 @@ def plot_all_mem_nb_cycles(
                 mem_positions[mem_qualif]
                 + nb_methods_positions[app_data["nb_methods_qualif"]],
                 math.ceil(
-                    mean([
-                        nb_cycle for nb_cycle in app_data["nb_cycles"] if nb_cycle != 0
-                    ])
+                    mean(
+                        [nb_cycle for nb_cycle in app_data["nb_cycles"] if nb_cycle != 0]
+                    )
                 )
                 / 1000,
                 color="blue",
@@ -475,9 +475,9 @@ def plot_all_mem_nb_cycles(
                 + nb_methods_positions[app_data["nb_methods_qualif"]]
                 + 0.25,
                 math.ceil(
-                    mean([
-                        nb_cycle for nb_cycle in app_data["nb_cycles"] if nb_cycle != 0
-                    ])
+                    mean(
+                        [nb_cycle for nb_cycle in app_data["nb_cycles"] if nb_cycle != 0]
+                    )
                 )
                 / 1000,
                 color="red",

diff --git a/toccata/runner.py b/toccata/runner.py
@@ -415,9 +415,7 @@ def consolidate_logs(
                 os.makedirs(base_dir_name)
             os.makedirs(run_dir_name)
             # Base name
-            base_name: str = (
-                f"{run_dir_name}{formatted_date}_{config_name}-{run_number}"
-            )
+            base_name: str = f"{run_dir_name}{formatted_date}_{config_name}-{run_number}"
             # Dump the config data
             with open(f"{base_name}.config.json", "w") as outfile:
                 json.dump(config_data, outfile, indent=2, separators=(",", ": "))

diff --git a/tox.ini b/tox.ini
@@ -20,5 +20,6 @@ deps =
     mypy
 commands =
     pipenv install --dev
-    pipenv run ruff --fix .
+    pipenv run ruff check
+    pipenv run ruff format
     pipenv run mypy gigue