Fixes for llvm-install-src (#404)

* Support _path for install,llvm

Author: arjunsuresh

automation/script/module.py

@@ -3188,7 +3188,7 @@ def _update_variation_meta_with_dynamic_suffix(
                                     item_value[i] = l_item.replace(
                                         "#", variation_tag_dynamic_suffix)
                         else:
-                            value[item] = value[item].replace(
+                            value[item] = str(value[item]).replace(
                                 "#", variation_tag_dynamic_suffix)
 
             else:  # scalar value, never used?

script/get-llvm/customize.py

@@ -21,7 +21,7 @@ def preprocess(i):
             if os.path.exists(os.path.join(llvm_path, 'bin', 'clang')):
                 env['MLC_TMP_PATH'] = os.path.join(llvm_path, 'bin')
             else:
-                for l in os.listdir(aocc_path):
+                for l in os.listdir(llvm_path):
                     if os.path.exists(os.path.join(
                             llvm_path, l, 'bin', 'clang')):
                         llvm_path = os.path.join(llvm_path, l)

script/install-llvm-src/customize.py

@@ -17,36 +17,44 @@ def preprocess(i):
     clang_file_name = "clang"
     extra_cmake_options = ''
 
-    install_prefix = os.path.join(os.getcwd(), "install")
-
-    if env.get('MLC_LLVM_CONDA_ENV', '') == "yes":
-        install_prefix = env['MLC_CONDA_PREFIX']
-        extra_cmake_options = f"-DCMAKE_SHARED_LINKER_FLAGS=-L{install_prefix} -Wl,-rpath,{install_prefix}"
-
-    if is_true(env.get('MLC_LLVM_16_INTEL_MLPERF_INFERENCE', '')):
-        env['MLC_REQUIRE_INSTALL'] = 'yes'
-        i['run_script_input']['script_name'] = "install-llvm-16-intel-mlperf-inference"
-        clang_file_name = "llvm-link"
-        # env['USE_LLVM'] = install_prefix
-        # env['LLVM_DIR'] = os.path.join(env['USE_LLVM'], "lib", "cmake", "llvm")
+    if env.get('MLC_LLVM_INSTALLED_PATH', '') != '' and os.path.exists(
+            env.get('MLC_LLVM_INSTALLED_PATH')):
+        install_prefix = env['MLC_LLVM_INSTALLED_PATH']
     else:
-        if env.get('+MLC_LLVM_ENABLE_RUNTIMES', '') != '':
-            enable_runtimes = ";".join(env['+MLC_LLVM_ENABLE_RUNTIMES'])
-        else:
-            enable_runtimes = ''
+        install_prefix = os.path.join(os.getcwd(), "install")
 
-        if env.get('+MLC_LLVM_ENABLE_PROJECTS', '') != '':
-            enable_projects = ";".join(env['+MLC_LLVM_ENABLE_PROJECTS'])
+    if os.path.exists(os.path.join(install_prefix, "bin", "clang")) and is_true(
+            env.get('MLC_LLVM_USE_INSTALLED_DIR')):
+        i['run_script_input']['script_name'] = "no-install"  # skip install
+    else:
+        if env.get('MLC_LLVM_CONDA_ENV', '') == "yes":
+            install_prefix = env['MLC_CONDA_PREFIX']
+            extra_cmake_options = f"-DCMAKE_SHARED_LINKER_FLAGS=-L{install_prefix} -Wl,-rpath,{install_prefix}"
+
+        if is_true(env.get('MLC_LLVM_16_INTEL_MLPERF_INFERENCE', '')):
+            env['MLC_REQUIRE_INSTALL'] = 'yes'
+            i['run_script_input']['script_name'] = "install-llvm-16-intel-mlperf-inference"
+            clang_file_name = "llvm-link"
+            # env['USE_LLVM'] = install_prefix
+            # env['LLVM_DIR'] = os.path.join(env['USE_LLVM'], "lib", "cmake", "llvm")
         else:
-            enable_projects = ''
+            if env.get('+MLC_LLVM_ENABLE_RUNTIMES', '') != '':
+                enable_runtimes = ";".join(env['+MLC_LLVM_ENABLE_RUNTIMES'])
+            else:
+                enable_runtimes = ''
+
+            if env.get('+MLC_LLVM_ENABLE_PROJECTS', '') != '':
+                enable_projects = ";".join(env['+MLC_LLVM_ENABLE_PROJECTS'])
+            else:
+                enable_projects = ''
 
-        llvm_build_type = env['MLC_LLVM_BUILD_TYPE']
+            llvm_build_type = env['MLC_LLVM_BUILD_TYPE']
 
-        targets_to_build = env.get('MLC_LLVM_TARGETS_TO_BUILD', 'X86')
+            targets_to_build = env.get('MLC_LLVM_TARGETS_TO_BUILD', 'X86')
 
-        cmake_cmd = f"""cmake {os.path.join(env["MLC_LLVM_SRC_REPO_PATH"], "llvm")} -GNinja -DCMAKE_BUILD_TYPE={llvm_build_type } -DLLVM_ENABLE_PROJECTS={q}{enable_projects}{q} -DLLVM_ENABLE_RUNTIMES={q}{enable_runtimes}{q} -DCMAKE_INSTALL_PREFIX={q}{install_prefix}{q} -DLLVM_ENABLE_RTTI=ON  -DLLVM_INSTALL_UTILS=ON -DLLVM_TARGETS_TO_BUILD={targets_to_build} {extra_cmake_options}"""
+            cmake_cmd = f"""cmake {os.path.join(env["MLC_LLVM_SRC_REPO_PATH"], "llvm")} -GNinja -DCMAKE_BUILD_TYPE={llvm_build_type } -DLLVM_ENABLE_PROJECTS={q}{enable_projects}{q} -DLLVM_ENABLE_RUNTIMES={q}{enable_runtimes}{q} -DCMAKE_INSTALL_PREFIX={q}{install_prefix}{q} -DLLVM_ENABLE_RTTI=ON  -DLLVM_INSTALL_UTILS=ON -DLLVM_TARGETS_TO_BUILD={targets_to_build} {extra_cmake_options}"""
 
-        env['MLC_LLVM_CMAKE_CMD'] = cmake_cmd
+            env['MLC_LLVM_CMAKE_CMD'] = cmake_cmd
 
     need_version = env.get('MLC_VERSION', '')
 

script/install-llvm-src/meta.yaml

@@ -22,6 +22,9 @@ deps:
   names:
   - llvm-src-repo
   tags: get,git,repo
+  skip_if_env:
+    MLC_LLVM_INSTALLED_PATH:
+      - on
   update_tags_from_env_with_prefix:
     _branch.:
     - MLC_GIT_CHECKOUT
@@ -46,6 +49,9 @@ post_deps:
     MLC_REQUIRE_INSTALL:
     - 'yes'
   tags: get,llvm
+  update_tags_from_env_with_prefix:
+    _path.:
+      - MLC_LLVM_INSTALLED_PATH
 prehook_deps: []
 sort: 1000
 tags:
@@ -97,6 +103,10 @@ variations:
     env:
       MLC_LLVM_BUILD_TYPE: debug
     group: build-type
+  path.#:
+    env:
+       MLC_LLVM_INSTALLED_PATH: '#'
+       MLC_LLVM_USE_INSTALLED_DIR: yes
   for-intel-mlperf-inference-v3.1-bert:
     adr:
       conda-package: