gentoo auto-resync : 01:02:2023 - 15:05:01

2 files changed, 0 insertions, 140 deletions

diff --git a/dev-util/Tensile/files/Tensile-5.0.2-adjust-parallel.patch b/dev-util/Tensile/files/Tensile-5.0.2-adjust-parallel.patch
deleted file mode 100644
index b96429232c78..000000000000
--- a/dev-util/Tensile/files/Tensile-5.0.2-adjust-parallel.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 25b1621549f9b120462988913e657684645be79d Mon Sep 17 00:00:00 2001
-From: Lee Ringham <lringham@amd.com>
-Date: Tue, 2 Nov 2021 14:43:07 -0600
-Subject: [PATCH] Added better control of parallelism to control memory usage
-
----
- Tensile/Source/TensileCreateLibrary.cmake | 7 +++++--
- Tensile/cmake/TensileConfig.cmake         | 5 +++++
- 2 files changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/Tensile/Source/TensileCreateLibrary.cmake b/Tensile/Source/TensileCreateLibrary.cmake
-index 1dbacf41df..996f365bcf 100644
---- a/Tensile/Source/TensileCreateLibrary.cmake
-+++ b/Tensile/Source/TensileCreateLibrary.cmake
-@@ -33,7 +33,8 @@ function(TensileCreateLibraryCmake
-     Tensile_LIBRARY_FORMAT
-     Tensile_MERGE_FILES
-     Tensile_SHORT_FILE_NAMES
--    Tensile_LIBRARY_PRINT_DEBUG )
-+    Tensile_LIBRARY_PRINT_DEBUG
-+    Tensile_CPU_THREADS )
- 
- # make Tensile_PACKAGE_LIBRARY and optional parameter
- # to avoid breaking applications which us this
-@@ -51,6 +52,7 @@ function(TensileCreateLibraryCmake
-   message(STATUS "Tensile_COMPILER            from TensileCreateLibraryCmake : ${Tensile_COMPILER}")
-   message(STATUS "Tensile_ARCHITECTURE        from TensileCreateLibraryCmake : ${Tensile_ARCHITECTURE}")
-   message(STATUS "Tensile_LIBRARY_FORMAT      from TensileCreateLibraryCmake : ${Tensile_LIBRARY_FORMAT}")
-+  message(STATUS "Tensile_CPU_THREADS         from TensileCreateLibraryCmake : ${Tensile_CPU_THREADS}")
- 
-   #execute_process(COMMAND chmod 755 ${Tensile_ROOT}/bin/TensileCreateLibrary)
-   #execute_process(COMMAND chmod 755 ${Tensile_ROOT}/bin/Tensile)
-@@ -89,7 +91,8 @@ function(TensileCreateLibraryCmake
-   set(Tensile_CREATE_COMMAND ${Tensile_CREATE_COMMAND} "--code-object-version=${Tensile_CODE_OBJECT_VERSION}")
-   set(Tensile_CREATE_COMMAND ${Tensile_CREATE_COMMAND} "--cxx-compiler=${Tensile_COMPILER}")
-   set(Tensile_CREATE_COMMAND ${Tensile_CREATE_COMMAND} "--library-format=${Tensile_LIBRARY_FORMAT}")
--
-+  set(Tensile_CREATE_COMMAND ${Tensile_CREATE_COMMAND} "--jobs=${Tensile_CPU_THREADS}")
-+  
-   # TensileLibraryWriter positional arguments
-   set(Tensile_CREATE_COMMAND ${Tensile_CREATE_COMMAND}
-     ${Tensile_LOGIC_PATH}
-diff --git a/Tensile/cmake/TensileConfig.cmake b/Tensile/cmake/TensileConfig.cmake
-index 0ac8517c2c..fa8cb96305 100644
---- a/Tensile/cmake/TensileConfig.cmake
-+++ b/Tensile/cmake/TensileConfig.cmake
-@@ -112,6 +112,7 @@ function(TensileCreateLibraryFiles
-        LIBRARY_FORMAT
-        TENSILE_ROOT
-        VAR_PREFIX
-+       CPU_THREADS
-        )
- 
-   # Multi value settings
-@@ -184,6 +185,10 @@ function(TensileCreateLibraryFiles
-     set(Options ${Options} "--cmake-cxx-compiler=${Tensile_COMPILER_PATH}")
-   endif()
- 
-+  if(Tensile_CPU_THREADS)
-+    set(Options ${Options} "--jobs=${Tensile_CPU_THREADS}")
-+  endif()
-+
-   if(Tensile_LIBRARY_FORMAT)
-     set(Options ${Options} "--library-format=${Tensile_LIBRARY_FORMAT}")
-     if(Tensile_LIBRARY_FORMAT MATCHES "yaml")
diff --git a/dev-util/Tensile/files/Tensile-5.0.2-gentoopath.patch b/dev-util/Tensile/files/Tensile-5.0.2-gentoopath.patch
deleted file mode 100644
index b8b59af5184e..000000000000
--- a/dev-util/Tensile/files/Tensile-5.0.2-gentoopath.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-Fix incorrect path in scripts and CMakeLists, in order to build tensile_client 
-===================================================================
---- Tensile-rocm-5.0.2.orig/Tensile/Source/client/CMakeLists.txt
-+++ Tensile-rocm-5.0.2/Tensile/Source/client/CMakeLists.txt
-@@ -56,3 +56,5 @@ endif()
- foreach(arch IN LISTS TENSILE_GPU_ARCHS)
-     target_link_libraries(tensile_client PRIVATE "--amdgpu-target=${arch}")
- endforeach(arch)
-+
-+target_link_libraries(tensile_client PRIVATE LLVMSupport)
-Index: Tensile-rocm-5.0.2/Tensile/Source/lib/CMakeLists.txt
-===================================================================
---- Tensile-rocm-5.0.2.orig/Tensile/Source/lib/CMakeLists.txt
-+++ Tensile-rocm-5.0.2/Tensile/Source/lib/CMakeLists.txt
-@@ -47,7 +47,7 @@ set(tensile_sources  ${tensile_sources}
-     )
- 
- if(TENSILE_USE_LLVM)
--    find_package(LLVM 13.0 QUIET CONFIG)
-+    find_package(LLVM PATHS @GENTOO_PORTAGE_EPREFIX@/usr/lib/llvm/roc QUIET CONFIG)
-     if(NOT LLVM_FOUND)
-         find_package(LLVM 12.0 QUIET CONFIG)
-         if(NOT LLVM_FOUND)
-Index: Tensile-rocm-5.0.2/Tensile/Common.py
-===================================================================
---- Tensile-rocm-5.0.2.orig/Tensile/Common.py
-+++ Tensile-rocm-5.0.2/Tensile/Common.py
-@@ -1873,7 +1873,7 @@ def assignGlobalParameters( config ):
-     else:
-       print2(" %24s: %8s (unspecified)" % (key, defaultValue))
- 
--  globalParameters["ROCmPath"] = "/opt/rocm"
-+  globalParameters["ROCmPath"] = "@GENTOO_PORTAGE_EPREFIX@/usr"
-   if "ROCM_PATH" in os.environ:
-     globalParameters["ROCmPath"] = os.environ.get("ROCM_PATH")
-   if "TENSILE_ROCM_PATH" in os.environ:
-Index: Tensile-rocm-5.0.2/Tensile/ClientWriter.py
-===================================================================
---- Tensile-rocm-5.0.2.orig/Tensile/ClientWriter.py
-+++ Tensile-rocm-5.0.2/Tensile/ClientWriter.py
-@@ -205,7 +205,7 @@ def getBuildClientLibraryScript(buildPat
-   import io
-   runScriptFile = io.StringIO()
- 
--  callCreateLibraryCmd = globalParameters["ScriptPath"] + "/bin/TensileCreateLibrary"
-+  callCreateLibraryCmd = "TensileCreateLibrary"
- 
- 
-   if globalParameters["MergeFiles"]:
-Index: Tensile-rocm-5.0.2/Tensile/GenerateSummations.py
-===================================================================
---- Tensile-rocm-5.0.2.orig/Tensile/GenerateSummations.py
-+++ Tensile-rocm-5.0.2/Tensile/GenerateSummations.py
-@@ -57,7 +57,7 @@ def createLibraryForBenchmark(logicPath,
-     Selection.
-     """
- 
--    pythonExePath = os.path.join(os.path.dirname(os.path.realpath(__file__)), "bin", "TensileCreateLibrary")
-+    pythonExePath = "TensileCreateLibrary"
-     args = [pythonExePath, \
-         "--merge-files", "--new-client-only", "--no-short-file-names", "--no-library-print-debug", \
-         "--architecture=all", "--code-object-version=V3", "--cxx-compiler=hipcc", "--library-format=yaml", \
-Index: Tensile-rocm-5.0.2/HostLibraryTests/CMakeLists.txt
-===================================================================
---- Tensile-rocm-5.0.2.orig/HostLibraryTests/CMakeLists.txt
-+++ Tensile-rocm-5.0.2/HostLibraryTests/CMakeLists.txt
-@@ -135,7 +135,7 @@ set(test_sources ${test_sources}
- )
- 
- if(TENSILE_USE_LLVM)
--    find_package(LLVM 13.0 QUIET CONFIG)
-+    find_package(LLVM PATHS @GENTOO_PORTAGE_EPREFIX@/usr/lib/llvm/roc QUIET CONFIG)
-     if(NOT LLVM_FOUND)
-         find_package(LLVM 12.0 QUIET CONFIG)
-         if(NOT LLVM_FOUND)