[Refactor] Remove deprecated env var

Author: YWHyuk

PyTorchSimFrontend/extension_codecache.py

@@ -27,19 +27,6 @@ def dump_metadata(args, arg_attributes, path):
             file.write(f'{arg_name}=({arg_attribute[0]}, {arg.dtype}, {arg.shape})\n')
     return
 
-def llvm_compile_command(input, output):
-    opt_output = f"{input[:-3]}_opt.ll"
-    return [re.sub(r"[ \n]+", " ",
-        f"""
-            {extension_config.CONFIG_TORCHSIM_LLVM_PATH}/opt --load-pass-plugin={extension_config.CONFIG_TORCHSIM_CUSTOM_PASS_PATH}/libLowerGemminiPass.so -S -march=riscv64 --passes=LowerGemminiPass {input} -o {opt_output}
-        """,
-    ).strip(),
-            re.sub(r"[ \n]+", " ",
-        f"""
-            {extension_config.CONFIG_TORCHSIM_LLVM_PATH}/llc -march=riscv64 -mattr=+m,+f,+d,+a,+c,+v -O2 {opt_output} -o {output}
-        """,
-    ).strip()]
-
 def mlir_compile_command(filename, vectorlane_size, vlen=256):
     return [re.sub(r"[ \n]+", " ",
         f"""

PyTorchSimFrontend/extension_config.py

@@ -42,9 +42,6 @@ def __getattr__(name):
     # LLVM PATH
     if name == "CONFIG_TORCHSIM_LLVM_PATH":
         return os.environ.get('TORCHSIM_LLVM_PATH', default="/usr/bin")
-    if name == "CONFIG_TORCHSIM_CUSTOM_PASS_PATH":
-        return os.environ.get('TORCHSIM_CUSTOM_PASS_PATH',
-                                              default=f"{__getattr__('CONFIG_TORCHSIM_DIR')}/GemminiLowerPass/build")
     if name == "CONFIG_TORCHSIM_DUMP_MLIR_IR":
         return int(os.environ.get("TORCHSIM_DUMP_MLIR_IR", default=False))
     if name == "CONFIG_TORCHSIM_DUMP_LLVM_IR":
@@ -64,13 +61,6 @@ def __getattr__(name):
     # GEM5 config
     if name == "CONFIG_GEM5_PATH":
         return os.environ.get('GEM5_PATH', default="/workspace/gem5/build/RISCV/gem5.opt")
-    if name == "CONFIG_GEM5_SCRIPT_PATH":
-        return os.environ.get('GEM5_SCRIPT_PATH',
-                                      default=f"{__getattr__('CONFIG_TORCHSIM_DIR')}/gem5_script/script_systolic.py")
-
-    # For block sparse
-    if name == "CONFIG_BLOCK_SPARSE":
-        return int(os.environ.get('BLOCK_SPARSE', default=0))
 
     # Mapping Policy
     if name == "CONFIG_MAPPING_POLICY":
@@ -105,6 +95,7 @@ def __getattr__(name):
     # Compiler Optimization
     if name == "CONFIG_COMPILER_OPTIMIZATION":
         return os.environ.get('TORCHSIM_COMPILER_OPTIMIZATION', default="all")  # options: all, none, custom
+
     # Advanced fusion options
     if name == "CONFIG_FUSION":
         return True if (__getattr__("CONFIG_COMPILER_OPTIMIZATION") == "all" or "fusion" in __getattr__("CONFIG_COMPILER_OPTIMIZATION")) else False

README.md

@@ -333,8 +333,6 @@ export TORCHSIM_VECTOR_LANE=128 # vector lane size
 export TORCHSIM_VECTOR_LANE_STRIDE=2  # vector lane stride for DMA
 export TORCHSIM_DIR=/workspace/PyTorchSim # home directory
 
-export BLOCK_SPARSE=0 # If you want to use block sparse workload, turn it on
-
 # Plan which tensor allocated in TPUv4's CMEM
 export SRAM_BUFFER_PLAN_PATH=/workspace/PyTorchSim/tpuv4/gemm_plan.py
 

Simulator/simulator.py

@@ -161,7 +161,8 @@ def show_progress():
             print("")
 
         dir_path = os.path.join(os.path.dirname(target_binary), "m5out")
-        gem5_cmd = [extension_config.CONFIG_GEM5_PATH, "-r", "--stdout-file=sto.log", "-d", dir_path, extension_config.CONFIG_GEM5_SCRIPT_PATH, "-c", target_binary, "--vlane", str(vectorlane_size)]
+        gem5_script_path = os.path.join(extension_config.CONFIG_TORCHSIM_DIR, "gem5_script/script_systolic.py")
+        gem5_cmd = [extension_config.CONFIG_GEM5_PATH, "-r", "--stdout-file=sto.log", "-d", dir_path, gem5_script_path, "-c", target_binary, "--vlane", str(vectorlane_size)]
         try:
             # Create progress thread
             is_dryrun = int(os.environ.get('TOGSIM_DRYRUN', default=False)) or silent_mode