Merge branch 'unique_temp_file_ids' into unique_files_id

Author: Mascinissa

tiralib/tiramisu/compiling_service.py

@@ -40,7 +40,7 @@ def compile_legality(cls, schedule: Schedule, with_ast: bool = False):
 
         output_path = os.path.join(
             BaseConfig.base_config.workspace,
-            f"{schedule.tiramisu_program.name}_legality",
+            f"{schedule.tiramisu_program.temp_files_identifier}_legality",
         )
 
         cpp_code = cls.get_legality_code(schedule=schedule, with_ast=with_ast)
@@ -129,7 +129,7 @@ def compile_annotations(cls, tiramisu_program: TiramisuProgram):
 
         output_path = os.path.join(
             BaseConfig.base_config.workspace,
-            f"{tiramisu_program.name}_annotations",
+            f"{tiramisu_program.temp_files_identifier}_annotations",
         )
         # Add code to the original file to get json annotations
 
@@ -167,7 +167,7 @@ def compile_isl_ast_tree(
 
         output_path = os.path.join(
             BaseConfig.base_config.workspace,
-            f"{tiramisu_program.name}_isl_ast",
+            f"{tiramisu_program.temp_files_identifier}_isl_ast",
         )
         get_isl_ast_lines = ""
         if schedule:
@@ -323,7 +323,7 @@ def call_skewing_solver(
         logger.debug("Skewing Solver Code:\n" + solver_code)
         output_path = os.path.join(
             BaseConfig.base_config.workspace,
-            f"{schedule.tiramisu_program.name}_skewing_solver",
+            f"{schedule.tiramisu_program.temp_files_identifier}_skewing_solver",
         )
 
         result_str = cls.run_cpp_code(cpp_code=solver_code, output_path=output_path)
@@ -443,7 +443,7 @@ def get_cpu_exec_times(  # noqa: C901
         cpp_code = cls.get_schedule_code(tiramisu_program, optims_list)
         # Write the code to a file
         output_path = os.path.join(
-            BaseConfig.base_config.workspace, tiramisu_program.name
+            BaseConfig.base_config.workspace, tiramisu_program.temp_files_identifier
         )
 
         cls.write_to_disk(cpp_code, output_path + "_schedule")
@@ -473,17 +473,17 @@ def get_cpu_exec_times(  # noqa: C901
         shell_script = [
             # Compile intermidiate tiramisu file
             f"cd {BaseConfig.base_config.workspace}",
-            f"$CXX -Wl,--no-as-needed -ldl -g -fno-rtti -lpthread -fopenmp -std=c++17 -O0 -o {tiramisu_program.name}.o -c {tiramisu_program.name}_schedule.cpp",
+            f"$CXX -Wl,--no-as-needed -ldl -g -fno-rtti -lpthread -fopenmp -std=c++17 -O0 -o {tiramisu_program.temp_files_identifier}.o -c {tiramisu_program.temp_files_identifier}_schedule.cpp",
             # Link generated file with executer
-            f"$CXX -Wl,--no-as-needed -ldl -g -fno-rtti -lpthread -fopenmp -std=c++17 -O0 {tiramisu_program.name}.o -o {tiramisu_program.name}.out -ltiramisu -ltiramisu_auto_scheduler -lHalide -lisl",
+            f"$CXX -Wl,--no-as-needed -ldl -g -fno-rtti -lpthread -fopenmp -std=c++17 -O0 {tiramisu_program.temp_files_identifier}.o -o {tiramisu_program.temp_files_identifier}.out -ltiramisu -ltiramisu_auto_scheduler -lHalide -lisl",
             # Run the program
-            f"./{tiramisu_program.name}.out",
-            f"$CXX -shared -o {tiramisu_program.name}.so {tiramisu_program.name}.o",  # noqa: E501
+            f"./{tiramisu_program.temp_files_identifier}.out",
+            f"$CXX -shared -o {tiramisu_program.temp_files_identifier}.so {tiramisu_program.temp_files_identifier}.o",  # noqa: E501
         ]
         if not tiramisu_program.wrapper_obj:
             shell_script += [
                 # compile the wrapper
-                f"$CXX -std=c++17 -fno-rtti -o {tiramisu_program.name}_wrapper -ltiramisu -lHalide -ldl -lpthread -fopenmp -lm {tiramisu_program.name}_wrapper.cpp ./{tiramisu_program.name}.so -ltiramisu -lHalide -ldl -lpthread -fopenmp -lm -lisl"
+                f"$CXX -std=c++17 -fno-rtti -o {tiramisu_program.temp_files_identifier}_wrapper -ltiramisu -lHalide -ldl -lpthread -fopenmp -lm {tiramisu_program.temp_files_identifier}_wrapper.cpp ./{tiramisu_program.temp_files_identifier}.so -ltiramisu -lHalide -ldl -lpthread -fopenmp -lm -lisl"
             ]
         try:
             # run the compilation of the generator and wrapper
@@ -558,11 +558,6 @@ def get_cpu_exec_times(  # noqa: C901
                         check=False,
                     )
 
-                    if delete_files:
-                        CompilingService.delete_temporary_files(
-                            tiramisu_program=tiramisu_program
-                        )
-
                     # if the command has to quit properly, that is either on timeout or (noraml completion and non-empty stdout)
                     if not (
                         compiler.returncode == 124
@@ -589,7 +584,10 @@ def get_cpu_exec_times(  # noqa: C901
                                 f"Execution of wrapper timed-out. Completed {len(results)} out of {min_runs} min_runs and {len(compiler.stdout.split())} out of {nb_exec_left} extra runs. Collected measurements are [{' '.join(list(map(str, results)))}]+[{compiler.stdout}]."
                             )
                         results += [float(x) for x in compiler.stdout.split()]
-
+            if delete_files:
+                CompilingService.delete_temporary_files(
+                    tiramisu_program=tiramisu_program
+                )
             return results
 
         except subprocess.CalledProcessError as e:
@@ -619,9 +617,9 @@ def get_n_runs_script(
             #  set the env variables
             f"export NB_EXEC={nb_exec}",
             # run the wrapper
-            f"./{tiramisu_program.name}_wrapper"
+            f"./{tiramisu_program.temp_files_identifier}_wrapper"
             if timeout is None
-            else f"timeout {timeout / 1000} ./{tiramisu_program.name}_wrapper",
+            else f"timeout {timeout / 1000} ./{tiramisu_program.temp_files_identifier}_wrapper",
         ]
 
     @classmethod
@@ -630,7 +628,7 @@ def delete_temporary_files(cls, tiramisu_program: TiramisuProgram):
         subprocess.run(
             [
                 # cd to the workspace and clean generated files
-                f"cd {BaseConfig.base_config.workspace} && rm {tiramisu_program.name}*"
+                f"cd {BaseConfig.base_config.workspace} && rm {tiramisu_program.temp_files_identifier}*"
             ],
             capture_output=True,
             text=True,

tiralib/tiramisu/tiramisu_program.py

@@ -1,6 +1,7 @@
 import json
 import random
 import re
+import string
 from pathlib import Path
 from typing import Dict
 
@@ -23,6 +24,9 @@ class TiramisuProgram:
         The list of computations in the function
     `name`: str
         The name of the function
+    `temp_files_identifier`: str
+        A unique name prefix used to differentiate between temporary files
+        generated by concurrently running instances of TiraLib
     `schedules_legality`: dict
         The legality of the schedules of the function
     `schedules_solver`: dict
@@ -43,6 +47,7 @@ def __init__(self: "TiramisuProgram"):
         self.isl_ast_string: str | None = None
         self.comps: list[str] | None = None
         self.name: str | None = None
+        self.temp_files_identifier: str | None = None
         # self.schedules_legality = {}
         # self.schedules_solver = {}
         self.schedules_dict: Dict = {}
@@ -67,6 +72,11 @@ def from_dict(
         # Initiate an instante of the TiramisuProgram class
         tiramisu_prog = cls()
         tiramisu_prog.name = name
+        tiramisu_prog.temp_files_identifier = (
+            tiramisu_prog.name
+            + "_"
+            + "".join(random.choices(string.ascii_letters + string.digits, k=5))
+        )
         tiramisu_prog.annotations = data["program_annotation"]
         if tiramisu_prog.annotations:
             tiramisu_prog.comps = list(tiramisu_prog.annotations["computations"].keys())
@@ -225,10 +235,21 @@ def load_code_lines(self, original_str: str | None = None):
             self.original_str,
         )[0]
         self.name = re.findall(r"tiramisu::init\(\"(\w+)\"\);", self.original_str)[0]
+        self.temp_files_identifier = (
+            self.name
+            + "_"
+            + "".join(random.choices(string.ascii_letters + string.digits, k=5))
+        )
         # Remove the wrapper include from the original string
-        self.wrapper_str = f'#include "{self.name}_wrapper.h"'
+        self.wrapper_str = f'#include "{self.temp_files_identifier}_wrapper.h"'
         self.original_str = self.original_str.replace(
-            self.wrapper_str, f"// {self.wrapper_str}"
+            f'#include "{self.name}_wrapper.h"', f"// {self.wrapper_str}"
+        )
+        # Change the file name of the generated object file in the codegen line to use the temp files identifier
+        self.original_str = re.sub(
+            r'(tiramisu::codegen\(\{[^}]+\},\s*")([^"]*)("\);)',
+            r"\1" + f"./{self.temp_files_identifier}.o" + r"\3",
+            self.original_str,
         )
         self.comps = re.findall(r"computation (\w+)\(", self.original_str)
         self.code_gen_line = re.findall(r"tiramisu::codegen\({.+;", self.original_str)[
@@ -257,7 +278,9 @@ def construct_wrapper_code(
         if self.name is None:
             raise Exception("TiramisuProgram.name is None")
 
-        wrapper_cpp_code = wrapper_cpp_template.replace("$func_name$", self.name)
+        wrapper_cpp_code = wrapper_cpp_template.replace(
+            "$func_id$", self.temp_files_identifier
+        ).replace("$func_name$", self.name)
         wrapper_cpp_code = wrapper_cpp_code.replace(
             "$buffers_init$", buffers_init_lines
         )
@@ -285,7 +308,7 @@ def __repr__(self) -> str:
 
 
 wrapper_cpp_template = """#include "Halide.h"
-#include "$func_name$_wrapper.h"
+#include "$func_id$_wrapper.h"
 #include "tiramisu/utils.h"
 #include <iostream>
 #include <time.h>