Lerking/OSACA
1
0
Fork 0
mirror of https://github.com/RRZE-HPC/OSACA.git synced 2025-12-16 09:00:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

The tests are passing.

Browse Source
This commit is contained in:
pleroy
2025-01-04 18:59:38 +01:00
parent 56fbe1d172
commit 4255c11010
2 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
osaca/semantics/kernel_dg.py
View File

@@ -55,8 +55,9 @@ class KernelDG(nx.DiGraph):
@staticmethod @staticmethod
def get_load_line_number(line_number): def get_load_line_number(line_number):
# The offset is irrelevant, but it must be a machine number to avoid silly rounding issues. # The line number of the load must be less than the line number of the instruction. The
return line_number + 0.125 # offset is irrelevant, but it must be a machine number to avoid silly rounding issues.
return line_number - 0.125
def create_DG(self, kernel, flag_dependencies=False): def create_DG(self, kernel, flag_dependencies=False):
""" """
@@ -78,7 +79,6 @@ class KernelDG(nx.DiGraph):
dg.add_node(instruction_form.line_number) dg.add_node(instruction_form.line_number)
dg.nodes[instruction_form.line_number]["instruction_form"] = instruction_form dg.nodes[instruction_form.line_number]["instruction_form"] = instruction_form
# add load as separate node if existent # add load as separate node if existent
load_line_number = None
if ( if (
INSTR_FLAGS.HAS_LD in instruction_form.flags INSTR_FLAGS.HAS_LD in instruction_form.flags
and INSTR_FLAGS.LD not in instruction_form.flags and INSTR_FLAGS.LD not in instruction_form.flags
@@ -98,7 +98,6 @@ class KernelDG(nx.DiGraph):
latency=instruction_form.latency - instruction_form.latency_wo_load, latency=instruction_form.latency - instruction_form.latency_wo_load,
) )
#TODO comments #TODO comments
print("LOADS", loads)
for i, instruction_form in enumerate(kernel): for i, instruction_form in enumerate(kernel):
for dep, dep_flags in self.find_depending( for dep, dep_flags in self.find_depending(
instruction_form, kernel[i + 1 :], flag_dependencies instruction_form, kernel[i + 1 :], flag_dependencies
@@ -405,15 +404,20 @@ class KernelDG(nx.DiGraph):
if isinstance(src, FlagOperand): if isinstance(src, FlagOperand):
is_read = self.parser.is_flag_dependend_of(register, src) or is_read is_read = self.parser.is_flag_dependend_of(register, src) or is_read
if isinstance(src, MemoryOperand): if isinstance(src, MemoryOperand):
is_memory_read = False
#print("1", is_read) #print("1", is_read)
if src.base is not None: if src.base is not None:
is_read = self.parser.is_reg_dependend_of(register, src.base) or is_read is_memory_read = self.parser.is_reg_dependend_of(register, src.base)
#print("2", is_read) #print("2", is_read)
if src.index is not None and isinstance(src.index, RegisterOperand): if src.index is not None and isinstance(src.index, RegisterOperand):
is_read = self.parser.is_reg_dependend_of(register, src.index) or is_read is_memory_read = (
self.parser.is_reg_dependend_of(register, src.index)
or is_memory_read
)
#print("3", is_read) #print("3", is_read)
#print("FORLOAD", register, src) #print("FORLOAD", register, src)
for_load = True for_load = is_memory_read
is_read = is_read or is_memory_read
# Check also if read in destination memory address # Check also if read in destination memory address
for dst in chain( for dst in chain(
instruction_form.semantic_operands["destination"], instruction_form.semantic_operands["destination"],

7
tests/test_semantics.py
View File

@@ -458,7 +458,7 @@ class TestSemanticTools(unittest.TestCase):
# / / # / /
# 4 / # 4 /
# / # /
# 5.1 # 4.875
# #
dg = KernelDG( dg = KernelDG(
self.kernel_x86_intel, self.kernel_x86_intel,
@@ -466,6 +466,7 @@ class TestSemanticTools(unittest.TestCase):
self.machine_model_csx, self.machine_model_csx,
self.semantics_csx_intel, self.semantics_csx_intel,
) )
print(dg.dg.adj)
self.assertTrue(nx.algorithms.dag.is_directed_acyclic_graph(dg.dg)) self.assertTrue(nx.algorithms.dag.is_directed_acyclic_graph(dg.dg))
self.assertEqual(len(list(dg.get_dependent_instruction_forms(line_number=3))), 1) self.assertEqual(len(list(dg.get_dependent_instruction_forms(line_number=3))), 1)
self.assertEqual(next(dg.get_dependent_instruction_forms(line_number=3)), 5) self.assertEqual(next(dg.get_dependent_instruction_forms(line_number=3)), 5)
@@ -473,8 +474,8 @@ class TestSemanticTools(unittest.TestCase):
self.assertEqual(next(dg.get_dependent_instruction_forms(line_number=4)), 5) self.assertEqual(next(dg.get_dependent_instruction_forms(line_number=4)), 5)
self.assertEqual(len(list(dg.get_dependent_instruction_forms(line_number=5))), 1) self.assertEqual(len(list(dg.get_dependent_instruction_forms(line_number=5))), 1)
self.assertEqual(next(dg.get_dependent_instruction_forms(line_number=5)), 6) self.assertEqual(next(dg.get_dependent_instruction_forms(line_number=5)), 6)
self.assertEqual(len(list(dg.get_dependent_instruction_forms(line_number=5.1))), 1) self.assertEqual(len(list(dg.get_dependent_instruction_forms(line_number=4.875))), 1)
self.assertEqual(next(dg.get_dependent_instruction_forms(line_number=5.1)), 5) self.assertEqual(next(dg.get_dependent_instruction_forms(line_number=4.875)), 5)
self.assertEqual(list(dg.get_dependent_instruction_forms(line_number=6)), []) self.assertEqual(list(dg.get_dependent_instruction_forms(line_number=6)), [])
self.assertEqual(list(dg.get_dependent_instruction_forms(line_number=7)), []) self.assertEqual(list(dg.get_dependent_instruction_forms(line_number=7)), [])
self.assertEqual(list(dg.get_dependent_instruction_forms(line_number=8)), []) self.assertEqual(list(dg.get_dependent_instruction_forms(line_number=8)), [])