From 45847e69ffd0e82240e85f7ac3da8e69031bfdad Mon Sep 17 00:00:00 2001 From: JanLJL Date: Sat, 16 Aug 2025 14:13:29 +0200 Subject: [PATCH] formatting for black --- osaca/parser/parser_x86intel.py | 9 ++++++--- osaca/semantics/kernel_dg.py | 22 ++++++++-------------- tests/test_parser_x86intel.py | 4 +--- 3 files changed, 15 insertions(+), 20 deletions(-) diff --git a/osaca/parser/parser_x86intel.py b/osaca/parser/parser_x86intel.py index 0540782..7713723 100644 --- a/osaca/parser/parser_x86intel.py +++ b/osaca/parser/parser_x86intel.py @@ -160,10 +160,13 @@ class ParserX86Intel(ParserX86): binary_number = pp.Combine(pp.Word("01") + pp.CaselessLiteral("B")) octal_number = pp.Combine(pp.Word("01234567") + pp.CaselessLiteral("O")) decimal_number = pp.Combine(pp.Optional(pp.Literal("-")) + pp.Word(pp.nums)) - hex_number_suffix = pp.Combine(pp.Word(pp.hexnums) + (pp.CaselessLiteral("H") ^ pp.CaselessLiteral("R"))) + hex_number_suffix = pp.Combine( + pp.Word(pp.hexnums) + (pp.CaselessLiteral("H") ^ pp.CaselessLiteral("R")) + ) hex_number_0x = pp.Combine( - pp.Optional(pp.Literal("-")) + pp.Literal("0x") + pp.Word(pp.hexnums)) - hex_number = (hex_number_0x ^ hex_number_suffix) + pp.Optional(pp.Literal("-")) + pp.Literal("0x") + pp.Word(pp.hexnums) + ) + hex_number = hex_number_0x ^ hex_number_suffix float_number = pp.Combine( pp.Optional(pp.Literal("-")) + pp.Word(pp.nums) + pp.Word(".", pp.nums) ).setResultsName("value") diff --git a/osaca/semantics/kernel_dg.py b/osaca/semantics/kernel_dg.py index 58919ee..ff073cf 100644 --- a/osaca/semantics/kernel_dg.py +++ b/osaca/semantics/kernel_dg.py @@ -67,9 +67,7 @@ class KernelDG(nx.DiGraph): @staticmethod def get_real_line_number(line_number): return ( - int(line_number + 0.125) - if KernelDG.is_load_line_number(line_number) - else line_number + int(line_number + 0.125) if KernelDG.is_load_line_number(line_number) else line_number ) def create_DG(self, kernel, flag_dependencies=False): @@ -100,9 +98,7 @@ class KernelDG(nx.DiGraph): loads[instruction_form.line_number] = load_line_number dg.add_node(load_line_number) dg.nodes[load_line_number]["instruction_form"] = InstructionForm( - mnemonic="_LOAD_", - line=instruction_form.line, - line_number=load_line_number + mnemonic="_LOAD_", line=instruction_form.line, line_number=load_line_number ) # and set LD latency as edge weight dg.add_edge( @@ -423,8 +419,7 @@ class KernelDG(nx.DiGraph): is_memory_read = self.parser.is_reg_dependend_of(register, src.base) if src.index is not None and isinstance(src.index, RegisterOperand): is_memory_read = ( - self.parser.is_reg_dependend_of(register, src.index) - or is_memory_read + self.parser.is_reg_dependend_of(register, src.index) or is_memory_read ) for_load = is_memory_read is_read = is_read or is_memory_read @@ -614,7 +609,7 @@ class KernelDG(nx.DiGraph): (latency, list(deps)) for latency, deps in groupby(lcd, lambda dep: lcd[dep]["latency"]) ), - reverse=True + reverse=True, ) node_colors = {} edge_colors = {} @@ -637,17 +632,16 @@ class KernelDG(nx.DiGraph): edge_colors[u, v] = color max_color = min(11, colors_used) colorscheme = f"spectral{max(3, max_color)}" - graph.graph["node"] = {"colorscheme" : colorscheme} - graph.graph["edge"] = {"colorscheme" : colorscheme} + graph.graph["node"] = {"colorscheme": colorscheme} + graph.graph["edge"] = {"colorscheme": colorscheme} for n, color in node_colors.items(): if "style" not in graph.nodes[n]: graph.nodes[n]["style"] = "filled" else: graph.nodes[n]["style"] += ",filled" graph.nodes[n]["fillcolor"] = color - if ( - (max_color >= 4 and color in (1, max_color)) - or (max_color >= 10 and color in (1, 2, max_color - 1 , max_color)) + if (max_color >= 4 and color in (1, max_color)) or ( + max_color >= 10 and color in (1, 2, max_color - 1, max_color) ): graph.nodes[n]["fontcolor"] = "white" for (u, v), color in edge_colors.items(): diff --git a/tests/test_parser_x86intel.py b/tests/test_parser_x86intel.py index e96803c..f377725 100755 --- a/tests/test_parser_x86intel.py +++ b/tests/test_parser_x86intel.py @@ -234,9 +234,7 @@ class TestParserX86Intel(unittest.TestCase): self.assertEqual(parsed_16.operands[0], RegisterOperand(name="XMM0")) self.assertEqual( parsed_16.operands[1], - MemoryOperand( - base=RegisterOperand(name="RAX"), offset=ImmediateOperand(value=291) - ), + MemoryOperand(base=RegisterOperand(name="RAX"), offset=ImmediateOperand(value=291)), ) def test_parse_line(self):