-
Notifications
You must be signed in to change notification settings - Fork 17
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Void Linux support (formalizes #117)
- Add the necessary dependencies - Include necessary patches for systems where /bin/sh is not bash (including but not limited to Void Linux) - Fix an incompatibility in hipBLASLt between Clang 17 and GCC 13 - Take latest version of ucc (latest release is compatible with ROCm 6.x) - Remove building the "native" architecture from ucc -- this doesn't work in headless setups. The default list should be complete. Signed-off-by: Jeroen Mostert <jeroen.mostert@cm.com>
- Loading branch information
1 parent
836d401
commit abccb26
Showing
22 changed files
with
300 additions
and
39 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
44 changes: 44 additions & 0 deletions
44
patches/rocm-6.1.2/amd-fftw/0002-Change-here-string-bashism-to-POSIX-echo.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| From bbd4a16e3e4d69f8f67ce1deca0dbcc4f163ae43 Mon Sep 17 00:00:00 2001 | ||
| From: Jeroen Mostert <jeroen.mostert@cm.com> | ||
| Date: Sun, 4 Aug 2024 14:39:52 +0000 | ||
| Subject: [PATCH 2/2] Change here-string bashism to POSIX echo | ||
|
|
||
| Fixes builds on systems where /bin/sh is not bash | ||
|
|
||
| Signed-off-by: Jeroen Mostert <jeroen.mostert@cm.com> | ||
| --- | ||
| configure.ac | 6 +++--- | ||
| 1 file changed, 3 insertions(+), 3 deletions(-) | ||
|
|
||
| diff --git a/configure.ac b/configure.ac | ||
| index 24aaf4fc..af2390ac 100644 | ||
| --- a/configure.ac | ||
| +++ b/configure.ac | ||
| @@ -653,7 +653,7 @@ if test "$have_amd_opt" = yes && test "${enable_debug+set}" != "set" && test "$I | ||
| AC_DEFINE(AMD_DYNAMIC_DISPATCHER,1,[Define to enable AMD dynamic dispatcher feature that would build a single portable optimized library which can execute on different x86 CPU architectures.]) | ||
|
|
||
| SUBSTRGCC='gcc' | ||
| - if grep -q "$SUBSTRGCC" <<<"$CC"; then | ||
| + if echo "$CC" | grep -q "$SUBSTRGCC"; then | ||
| CFLAGS="$CFLAGS -mno-avx256-split-unaligned-store -mno-avx256-split-unaligned-load -mno-prefer-avx128" | ||
| else | ||
| AC_MSG_CHECKING([whether we are using clang 14 or later]) | ||
| @@ -683,13 +683,13 @@ if test "$have_amd_opt" = yes && test "${enable_debug+set}" != "set" && test "$I | ||
| fi | ||
| SUBSTRCLANG='clang' | ||
| SUBSTRGCC='gcc' | ||
| - if grep -q "$SUBSTRCLANG" <<<"$CC"; then | ||
| + if echo "$CC" | grep -q "$SUBSTRCLANG"; then | ||
| if [[ -z "${AMD_ARCH}" ]]; then | ||
| CFLAGS="$CFLAGS -mavx2 -mfma" | ||
| else | ||
| CFLAGS="$CFLAGS -march=$AMD_ARCH -mavx2 -mfma" | ||
| fi | ||
| - elif grep -q "$SUBSTRGCC" <<<"$CC"; then | ||
| + elif echo "$CC" | grep -q "$SUBSTRGCC"; then | ||
| GCCVERSION=$(expr `gcc -dumpversion | cut -f1 -d.`) | ||
| case "$AMDZENFAMILY" in | ||
| "23") | ||
| -- | ||
| 2.46.0 | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
44 changes: 44 additions & 0 deletions
44
patches/rocm-6.1.2/hipBLASLt/0008-Set-standard-to-C-17.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| From 76361246f1330cc1fb1b7fd0af4e3834d7563618 Mon Sep 17 00:00:00 2001 | ||
| From: Jeroen Mostert <jeroen.mostert@cm.com> | ||
| Date: Sun, 4 Aug 2024 17:07:19 +0000 | ||
| Subject: [PATCH 8/8] Set standard to C++17 | ||
|
|
||
| The combination of Clang 17 with the STL of GCC 13 doesn't work with | ||
| -std=c++20 (at the very least not on Void Linux). Nothing actually | ||
| uses C++20 features, so use the same flags as main Tensile. | ||
|
|
||
| Signed-off-by: Jeroen Mostert <jeroen.mostert@cm.com> | ||
| --- | ||
| CMakeLists.txt | 2 +- | ||
| tensilelite/Tensile/Source/lib/CMakeLists.txt | 2 +- | ||
| 2 files changed, 2 insertions(+), 2 deletions(-) | ||
|
|
||
| diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| index c6a16e01..31547bf7 100644 | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -25,7 +25,7 @@ | ||
| cmake_minimum_required(VERSION 3.5 FATAL_ERROR) | ||
|
|
||
| # This will add compile option: -std=c++17 | ||
| -set(CMAKE_CXX_STANDARD 20 ) | ||
| +set(CMAKE_CXX_STANDARD 17 ) | ||
| # Without this line, it will add -std=gnu++17 instead, which may have issues. | ||
| set(CMAKE_CXX_EXTENSIONS OFF ) | ||
| set(CMAKE_CXX_STANDARD_REQUIRED ON) | ||
| diff --git a/tensilelite/Tensile/Source/lib/CMakeLists.txt b/tensilelite/Tensile/Source/lib/CMakeLists.txt | ||
| index e9476b3d..72425d07 100644 | ||
| --- a/tensilelite/Tensile/Source/lib/CMakeLists.txt | ||
| +++ b/tensilelite/Tensile/Source/lib/CMakeLists.txt | ||
| @@ -91,7 +91,7 @@ add_library (TensileHost STATIC ${tensile_sources}) | ||
|
|
||
| set_target_properties(TensileHost | ||
| PROPERTIES | ||
| - CXX_STANDARD 20 | ||
| + CXX_STANDARD 17 | ||
| CXX_STANDARD_REQUIRED ON | ||
| CXX_EXTENSIONS OFF) | ||
|
|
||
| -- | ||
| 2.46.0 | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.