[rocisa] Use comgr instead of calling amdclang++

Author: KKyang

tensilelite/CMakeLists.txt

@@ -32,15 +32,15 @@ cmake_minimum_required(VERSION 3.15)
 # This CMakeLists.txt supports two modes with setting DEVELOP_MODE ON or OFF:
 # 1. Script mode (DEVELOP_MODE=ON): It creates a script that can be run after the configuration
 #    When using mode, you can run it as:
-#        cmake -DTENSILE_BIN=Tensile -DDEVELOP_MODE=ON ..
+#        cmake -DCMAKE_CXX_COMPILER=/opt/rocm/lib/llvm/bin/amdclang++ -DTENSILE_BIN=Tensile -DDEVELOP_MODE=ON ..
 #    The script will be created in the build folder and will be named in Tensile.bat or Tensile.sh
 #    depending on the platform. You can then run the script as:
 #        Tensile.sh config.yaml ./
 #    or
-#        Tensile.bat config.yaml ./    
+#        Tensile.bat config.yaml ./
 # 2. Normal CMake mode: It sets the Python srguments at configuration stage with "BIN_ARGS"
 #    With this mode, you can run it as:
-#        cmake -DTENSILE_BIN=Tensile -DBIN_ARGS="config.yaml ./" .. && cmake --build .
+#        cmake -DCMAKE_CXX_COMPILER=/opt/rocm/lib/llvm/bin/amdclang++ -DTENSILE_BIN=Tensile -DBIN_ARGS="config.yaml ./" .. && cmake --build .
 #    The script will check if the TENSILE_BIN is valid and if the BIN_ARGS
 #    are provided. It will then run the specified Tensile binary with the
 #    provided arguments after the build step.
@@ -123,7 +123,7 @@ else()
     message(STATUS "Script set: ${TENSILE_BIN} ${BIN_ARGS_LIST}")
 
     # Ensure the Python script runs after the build
-    add_custom_target(RunPythonScript 
+    add_custom_target(RunPythonScript
         ALL
         COMMAND ${CMAKE_COMMAND} -E env PYTHONPATH=${PYTHONPATH} -- ${Python_EXECUTABLE} ${TENSILE_BIN_ROOT}/${TENSILE_BIN} ${BIN_ARGS_LIST}
         COMMENT "Running Python script ${TENSILE_BIN} ${BIN_ARGS_LIST}"

tensilelite/README.md

@@ -2,7 +2,7 @@
 
 ** How to Rebuild Object Codes Directly from Assembly
 
-During the tuning process, it is of interest to modify an assembly file/s and rebuild the corresponding object file/s and then relink the corresponding co file. Currently, we generate additional source files and a script to provide this workflow. 
+During the tuning process, it is of interest to modify an assembly file/s and rebuild the corresponding object file/s and then relink the corresponding co file. Currently, we generate additional source files and a script to provide this workflow.
 
 A new `Makefile` is added that manages rebuilding a co file during iterative development when tuning. One modifies an assembly file of interest, then runs `make` and make will detect what file/s changed and rebuild accordingly.
 
@@ -14,7 +14,7 @@ Assumptions:
 
 Example:
 
-```cmake -DTENSILE_BIN=Tensile -DDEVELOP_MODE=ON -S <path-to-tensilelite-root> -B <tensile-out>```
+```cmake -DCMAKE_CXX_COMPILER=/opt/rocm/lib/llvm/bin/amdclang++ -DTENSILE_BIN=Tensile -DDEVELOP_MODE=ON -S <path-to-tensilelite-root> -B <tensile-out>```
 
 The script will be created in the build folder and will be named in Tensile.bat or Tensile.sh depending on the platform. Then you can then run the script under the ``tensile-out`` folder as usual:
 

tensilelite/rocisa/CMakeLists.txt

@@ -26,6 +26,8 @@ set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
+find_package(amd_comgr REQUIRED CONFIG)
+
 if(DEFINED Python_EXECUTABLE AND Python_EXECUTABLE)
     message(STATUS "Manually set Python_EXECUTABLE to ${Python_EXECUTABLE}")
 endif()
@@ -73,5 +75,7 @@ nanobind_add_module(rocisa NOMINSIZE NB_SUPPRESS_WARNINGS
                         ${CMAKE_CURRENT_SOURCE_DIR}/rocisa/src/macro.cpp
                         ${ROCISAINST_SOURCE}
                         ${ROCISAPASS_SOURCE})
+
 target_include_directories(rocisa PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/rocisa/include)
+target_link_libraries(rocisa PRIVATE amd_comgr)
 set_target_properties(rocisa PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)