From 8dff8f2989dff7fc6d662929235785d523ba0137 Mon Sep 17 00:00:00 2001 From: Udit Kumar Agarwal Date: Tue, 21 Jan 2025 12:30:58 -0800 Subject: [PATCH 1/4] [CI] Install `spriv-tools` on Linux docker containers This is intended to improve test coverage as some `llvm-spriv` tests require `spirv-tools` to execute. --- devops/scripts/install_build_tools.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/devops/scripts/install_build_tools.sh b/devops/scripts/install_build_tools.sh index 37e2c7e15ac4b..69ec050496e97 100755 --- a/devops/scripts/install_build_tools.sh +++ b/devops/scripts/install_build_tools.sh @@ -25,4 +25,5 @@ apt update && apt install -yqq \ curl \ libhwloc-dev \ libzstd-dev \ - time + time \ + spirv-tools From f717a34bba5dbbbac11d8acfb4b670410d1f8309 Mon Sep 17 00:00:00 2001 From: Udit Kumar Agarwal Date: Tue, 21 Jan 2025 13:04:10 -0800 Subject: [PATCH 2/4] Update install_build_tools.sh --- devops/scripts/install_build_tools.sh | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/devops/scripts/install_build_tools.sh b/devops/scripts/install_build_tools.sh index 69ec050496e97..6f6ea7dbdd6f7 100755 --- a/devops/scripts/install_build_tools.sh +++ b/devops/scripts/install_build_tools.sh @@ -25,5 +25,13 @@ apt update && apt install -yqq \ curl \ libhwloc-dev \ libzstd-dev \ - time \ - spirv-tools + time + +# Add LLVM's GPG key to obtain latest release of spriv-tool. +# Same as what's done in SPRIV-LLVM-TRANSLATOR: +# https://github.com/KhronosGroup/SPIRV-LLVM-Translator/blob/cec12d6cf46306d0a015e883d5adb5a8200df1c0/.github/workflows/check-out-of-tree-build.yml#L59 +curl -L "https://apt.llvm.org/llvm-snapshot.gpg.key" | sudo apt-key add - +curl -L "https://packages.lunarg.com/lunarg-signing-key-pub.asc" | sudo apt-key add - +echo "deb https://apt.llvm.org/jammy/ llvm-toolchain-jammy main" | sudo tee -a /etc/apt/sources.list +echo "deb https://packages.lunarg.com/vulkan jammy main" | sudo tee -a /etc/apt/sources.list +apt update && apt install -yqq spirv-tools From aeb9ab04ab8848ccedf3b545c7928a073154f13d Mon Sep 17 00:00:00 2001 From: Udit Kumar Agarwal Date: Tue, 21 Jan 2025 13:27:33 -0800 Subject: [PATCH 3/4] Get latest spriv-tools version --- devops/scripts/install_build_tools.sh | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/devops/scripts/install_build_tools.sh b/devops/scripts/install_build_tools.sh index 6f6ea7dbdd6f7..6a2599623eadc 100755 --- a/devops/scripts/install_build_tools.sh +++ b/devops/scripts/install_build_tools.sh @@ -27,11 +27,10 @@ apt update && apt install -yqq \ libzstd-dev \ time -# Add LLVM's GPG key to obtain latest release of spriv-tool. +# To obtain latest release of spriv-tool. # Same as what's done in SPRIV-LLVM-TRANSLATOR: # https://github.com/KhronosGroup/SPIRV-LLVM-Translator/blob/cec12d6cf46306d0a015e883d5adb5a8200df1c0/.github/workflows/check-out-of-tree-build.yml#L59 -curl -L "https://apt.llvm.org/llvm-snapshot.gpg.key" | sudo apt-key add - -curl -L "https://packages.lunarg.com/lunarg-signing-key-pub.asc" | sudo apt-key add - -echo "deb https://apt.llvm.org/jammy/ llvm-toolchain-jammy main" | sudo tee -a /etc/apt/sources.list -echo "deb https://packages.lunarg.com/vulkan jammy main" | sudo tee -a /etc/apt/sources.list +. /etc/os-release +curl -L "https://packages.lunarg.com/lunarg-signing-key-pub.asc" | apt-key add - +echo "deb https://packages.lunarg.com/vulkan $VERSION_CODENAME main" | sudo tee -a /etc/apt/sources.list apt update && apt install -yqq spirv-tools From 454e2d0bc7f5cd5c13f5fcd20cfffee23a357b64 Mon Sep 17 00:00:00 2001 From: Udit Kumar Agarwal Date: Wed, 22 Jan 2025 08:25:28 -0800 Subject: [PATCH 4/4] Remove sudo --- devops/scripts/install_build_tools.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devops/scripts/install_build_tools.sh b/devops/scripts/install_build_tools.sh index 6a2599623eadc..55cbc46aad449 100755 --- a/devops/scripts/install_build_tools.sh +++ b/devops/scripts/install_build_tools.sh @@ -32,5 +32,5 @@ apt update && apt install -yqq \ # https://github.com/KhronosGroup/SPIRV-LLVM-Translator/blob/cec12d6cf46306d0a015e883d5adb5a8200df1c0/.github/workflows/check-out-of-tree-build.yml#L59 . /etc/os-release curl -L "https://packages.lunarg.com/lunarg-signing-key-pub.asc" | apt-key add - -echo "deb https://packages.lunarg.com/vulkan $VERSION_CODENAME main" | sudo tee -a /etc/apt/sources.list +echo "deb https://packages.lunarg.com/vulkan $VERSION_CODENAME main" | tee -a /etc/apt/sources.list apt update && apt install -yqq spirv-tools