* [gentoo-commits] repo/gentoo:master commit in: dev-util/spirv-llvm-translator/, dev-util/spirv-llvm-translator/files/
@ 2019-05-01 16:52 Marek Szuba
0 siblings, 0 replies; 6+ messages in thread
From: Marek Szuba @ 2019-05-01 16:52 UTC (permalink / raw
To: gentoo-commits
commit: 93a52c5db9c1056a3b10ebbf9aff9a4047d86cc5
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 30 10:58:22 2019 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Wed May 1 16:51:26 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93a52c5d
dev-util/spirv-llvm-translator: new package
Third-order dependency of Intel Graphics Compute Runtime.
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
dev-util/spirv-llvm-translator/Manifest | 1 +
...lvm-translator-8.0.0.1-no_pkgconfig_files.patch | 18 ++++++
dev-util/spirv-llvm-translator/metadata.xml | 12 ++++
.../spirv-llvm-translator-8.0.0.1.ebuild | 65 ++++++++++++++++++++++
4 files changed, 96 insertions(+)
diff --git a/dev-util/spirv-llvm-translator/Manifest b/dev-util/spirv-llvm-translator/Manifest
new file mode 100644
index 00000000000..33846447d84
--- /dev/null
+++ b/dev-util/spirv-llvm-translator/Manifest
@@ -0,0 +1 @@
+DIST spirv-llvm-translator-8.0.0.1.tar.gz 437384 BLAKE2B bca52bfec04d0adc08b00f5fdbcb6cf953be00f835d2a393545e77bd8776063ef91e8fb62c232b50cbeab58a0a01bea6e47b89c1756699bf35481e87823995de SHA512 85faf176d1ce79d19f10c88055f4a102a5952dcdcd6709e5e5cfdbf69eb958d51020a3ad34198c7c874b42ee8e318f1ce3169ea92853134dfff3dc5843f84414
diff --git a/dev-util/spirv-llvm-translator/files/spirv-llvm-translator-8.0.0.1-no_pkgconfig_files.patch b/dev-util/spirv-llvm-translator/files/spirv-llvm-translator-8.0.0.1-no_pkgconfig_files.patch
new file mode 100644
index 00000000000..66e81dc3b20
--- /dev/null
+++ b/dev-util/spirv-llvm-translator/files/spirv-llvm-translator-8.0.0.1-no_pkgconfig_files.patch
@@ -0,0 +1,18 @@
+Do not install pkgconfig data files, pkg-config does not presently look at
+/usr/lib/llvm/.../pkgconfig and putting them in /usr/lib*/pkgconfig would
+cause collisions between slots.
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -66,11 +66,3 @@
+ DESTINATION
+ ${CMAKE_INSTALL_PREFIX}/include/LLVMSPIRVLib
+ )
+-
+-configure_file(LLVMSPIRVLib.pc.in ${CMAKE_BINARY_DIR}/LLVMSPIRVLib.pc @ONLY)
+-install(
+- FILES
+- ${CMAKE_BINARY_DIR}/LLVMSPIRVLib.pc
+- DESTINATION
+- ${CMAKE_INSTALL_PREFIX}/lib${LLVM_LIBDIR_SUFFIX}/pkgconfig
+-)
diff --git a/dev-util/spirv-llvm-translator/metadata.xml b/dev-util/spirv-llvm-translator/metadata.xml
new file mode 100644
index 00000000000..d7dec83e2de
--- /dev/null
+++ b/dev-util/spirv-llvm-translator/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>marecki@gentoo.org</email>
+ <name>Marek Szuba</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">KhronosGroup/SPIRV-LLVM-Translator</remote-id>
+ </upstream>
+</pkgmetadata>
+
diff --git a/dev-util/spirv-llvm-translator/spirv-llvm-translator-8.0.0.1.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-8.0.0.1.ebuild
new file mode 100644
index 00000000000..9e8e3b39fed
--- /dev/null
+++ b/dev-util/spirv-llvm-translator/spirv-llvm-translator-8.0.0.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-multilib flag-o-matic llvm eapi7-ver
+
+MY_PN="SPIRV-LLVM-Translator"
+MY_PV="$(ver_rs 3 -)"
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="Bi-directional translator between SPIR-V and LLVM IR"
+HOMEPAGE="https://github.com/KhronosGroup/SPIRV-LLVM-Translator"
+SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="UoI-NCSA"
+SLOT="8"
+KEYWORDS="~amd64"
+IUSE="test"
+
+S="${WORKDIR}/${MY_P}"
+
+COMMON="sys-devel/llvm:8=[${MULTILIB_USEDEP}]"
+DEPEND="${COMMON}
+ test? ( dev-python/lit )"
+RDEPEND="${COMMON}"
+
+LLVM_MAX_SLOT=8
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-8.0.0.1-no_pkgconfig_files.patch
+)
+
+src_prepare() {
+ append-flags -fPIC
+ cmake-utils_src_prepare
+}
+
+multilib_src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix)"
+ $(usex test "-DLLVM_INCLUDE_TESTS=ON" "")
+ )
+ cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+ cmake-utils_src_compile llvm-spirv
+}
+
+multilib_src_install() {
+ cmake-utils_src_install
+ # CMake does not install the executable so do it by hand
+ if multilib_is_native_abi; then
+ exeinto "$(get_llvm_prefix)"/bin
+ doexe "${BUILD_DIR}"/tools/llvm-spirv/llvm-spirv
+ fi
+}
+
+multilib_src_test() {
+ # TODO: figure out why some tests fail on amd64 when ABI==x86
+ if multilib_is_native_abi; then
+ lit "${BUILD_DIR}/test" || die "Error running tests for ABI ${ABI}"
+ fi
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/spirv-llvm-translator/, dev-util/spirv-llvm-translator/files/
@ 2021-02-27 14:39 Conrad Kostecki
0 siblings, 0 replies; 6+ messages in thread
From: Conrad Kostecki @ 2021-02-27 14:39 UTC (permalink / raw
To: gentoo-commits
commit: 0d6c49e059fcb04e8ee11031e5177927f8a53609
Author: Mike Lothian <mike <AT> fireburn <DOT> co <DOT> uk>
AuthorDate: Thu Feb 18 15:07:47 2021 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sat Feb 27 14:39:44 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d6c49e0
dev-util/spirv-llvm-translator: Add support for llvm 11.1
Signed-off-by: Mike Lothian <mike <AT> fireburn.co.uk>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../spirv-llvm-translator/files/llvm-11.1.0.patch | 10 ++++
.../spirv-llvm-translator-11.0.0-r1.ebuild | 63 ++++++++++++++++++++++
2 files changed, 73 insertions(+)
diff --git a/dev-util/spirv-llvm-translator/files/llvm-11.1.0.patch b/dev-util/spirv-llvm-translator/files/llvm-11.1.0.patch
new file mode 100644
index 00000000000..f4d243acc5e
--- /dev/null
+++ b/dev-util/spirv-llvm-translator/files/llvm-11.1.0.patch
@@ -0,0 +1,10 @@
+--- a/CMakeLists.txt 2021-02-18 14:52:20.079691789 +0000
++++ b/CMakeLists.txt 2021-02-18 14:47:43.773873042 +0000
+@@ -1,6 +1,6 @@
+ cmake_minimum_required(VERSION 3.3)
+
+-set (BASE_LLVM_VERSION 11.0.0)
++set (BASE_LLVM_VERSION 11.1.0)
+ set(LLVM_SPIRV_VERSION ${BASE_LLVM_VERSION}.0)
+
+ option(LLVM_SPIRV_INCLUDE_TESTS
diff --git a/dev-util/spirv-llvm-translator/spirv-llvm-translator-11.0.0-r1.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-11.0.0-r1.ebuild
new file mode 100644
index 00000000000..94dee02866a
--- /dev/null
+++ b/dev-util/spirv-llvm-translator/spirv-llvm-translator-11.0.0-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+
+inherit cmake-multilib flag-o-matic llvm
+
+EGIT_COMMIT="d6dc999eee381158a26f048a333467c9ce7e77f2"
+MY_PN="SPIRV-LLVM-Translator"
+MY_P="${MY_PN}-${EGIT_COMMIT}"
+
+DESCRIPTION="Bi-directional translator between SPIR-V and LLVM IR"
+HOMEPAGE="https://github.com/KhronosGroup/SPIRV-LLVM-Translator"
+SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="UoI-NCSA"
+SLOT="11"
+KEYWORDS="~amd64"
+IUSE="test tools"
+
+# I have yet to see a non-release spirv-llvm-translator ebuild pass ANY tests.
+# This is probably something silly like the test suite expecting different
+# directory names but I really can't be bothered to debug VCS snapshots.
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+COMMON="~sys-devel/clang-11.1.0:11=[${MULTILIB_USEDEP}]"
+DEPEND="${COMMON}"
+RDEPEND="${COMMON}"
+BDEPEND="test? ( dev-python/lit )"
+
+REQUIRED_USE="test? ( tools )"
+
+LLVM_MAX_SLOT=11
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-8.0.0.1-no_pkgconfig_files.patch
+ "${FILESDIR}"/llvm-11.1.0.patch
+)
+
+src_prepare() {
+ append-flags -fPIC
+ cmake_src_prepare
+}
+
+multilib_src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
+ -DLLVM_BUILD_TOOLS=$(usex tools "ON" "OFF")
+ $(usex test "-DLLVM_INCLUDE_TESTS=ON" "")
+ )
+ cmake_src_configure
+}
+
+multilib_src_test() {
+ # Some tests fail on amd64 when ABI==x86
+ if multilib_is_native_abi; then
+ lit "${BUILD_DIR}/test" || die "Error running tests for ABI ${ABI}"
+ fi
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/spirv-llvm-translator/, dev-util/spirv-llvm-translator/files/
@ 2021-02-27 14:42 Conrad Kostecki
0 siblings, 0 replies; 6+ messages in thread
From: Conrad Kostecki @ 2021-02-27 14:42 UTC (permalink / raw
To: gentoo-commits
commit: 277c66f920fd6a0e4aa8ddc8696d950b3a102b79
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 27 14:41:30 2021 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sat Feb 27 14:42:23 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=277c66f9
Revert "dev-util/spirv-llvm-translator: Add support for llvm 11.1"
This reverts commit 0d6c49e059fcb04e8ee11031e5177927f8a53609.
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../spirv-llvm-translator/files/llvm-11.1.0.patch | 10 ----
.../spirv-llvm-translator-11.0.0-r1.ebuild | 63 ----------------------
2 files changed, 73 deletions(-)
diff --git a/dev-util/spirv-llvm-translator/files/llvm-11.1.0.patch b/dev-util/spirv-llvm-translator/files/llvm-11.1.0.patch
deleted file mode 100644
index f4d243acc5e..00000000000
--- a/dev-util/spirv-llvm-translator/files/llvm-11.1.0.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/CMakeLists.txt 2021-02-18 14:52:20.079691789 +0000
-+++ b/CMakeLists.txt 2021-02-18 14:47:43.773873042 +0000
-@@ -1,6 +1,6 @@
- cmake_minimum_required(VERSION 3.3)
-
--set (BASE_LLVM_VERSION 11.0.0)
-+set (BASE_LLVM_VERSION 11.1.0)
- set(LLVM_SPIRV_VERSION ${BASE_LLVM_VERSION}.0)
-
- option(LLVM_SPIRV_INCLUDE_TESTS
diff --git a/dev-util/spirv-llvm-translator/spirv-llvm-translator-11.0.0-r1.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-11.0.0-r1.ebuild
deleted file mode 100644
index 94dee02866a..00000000000
--- a/dev-util/spirv-llvm-translator/spirv-llvm-translator-11.0.0-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-
-inherit cmake-multilib flag-o-matic llvm
-
-EGIT_COMMIT="d6dc999eee381158a26f048a333467c9ce7e77f2"
-MY_PN="SPIRV-LLVM-Translator"
-MY_P="${MY_PN}-${EGIT_COMMIT}"
-
-DESCRIPTION="Bi-directional translator between SPIR-V and LLVM IR"
-HOMEPAGE="https://github.com/KhronosGroup/SPIRV-LLVM-Translator"
-SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="UoI-NCSA"
-SLOT="11"
-KEYWORDS="~amd64"
-IUSE="test tools"
-
-# I have yet to see a non-release spirv-llvm-translator ebuild pass ANY tests.
-# This is probably something silly like the test suite expecting different
-# directory names but I really can't be bothered to debug VCS snapshots.
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-COMMON="~sys-devel/clang-11.1.0:11=[${MULTILIB_USEDEP}]"
-DEPEND="${COMMON}"
-RDEPEND="${COMMON}"
-BDEPEND="test? ( dev-python/lit )"
-
-REQUIRED_USE="test? ( tools )"
-
-LLVM_MAX_SLOT=11
-
-PATCHES=(
- "${FILESDIR}"/${PN}-8.0.0.1-no_pkgconfig_files.patch
- "${FILESDIR}"/llvm-11.1.0.patch
-)
-
-src_prepare() {
- append-flags -fPIC
- cmake_src_prepare
-}
-
-multilib_src_configure() {
- local mycmakeargs=(
- -DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
- -DLLVM_BUILD_TOOLS=$(usex tools "ON" "OFF")
- $(usex test "-DLLVM_INCLUDE_TESTS=ON" "")
- )
- cmake_src_configure
-}
-
-multilib_src_test() {
- # Some tests fail on amd64 when ABI==x86
- if multilib_is_native_abi; then
- lit "${BUILD_DIR}/test" || die "Error running tests for ABI ${ABI}"
- fi
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/spirv-llvm-translator/, dev-util/spirv-llvm-translator/files/
@ 2022-04-24 22:35 Conrad Kostecki
0 siblings, 0 replies; 6+ messages in thread
From: Conrad Kostecki @ 2022-04-24 22:35 UTC (permalink / raw
To: gentoo-commits
commit: 22efb6296e9d778e6649f5db96e94c81af980e11
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 24 22:09:06 2022 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Apr 24 22:35:09 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22efb629
dev-util/spirv-llvm-translator: drop 12.0.0
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
dev-util/spirv-llvm-translator/Manifest | 1 -
...lvm-translator-8.0.0.1-no_pkgconfig_files.patch | 18 --------
.../spirv-llvm-translator-12.0.0.ebuild | 54 ----------------------
3 files changed, 73 deletions(-)
diff --git a/dev-util/spirv-llvm-translator/Manifest b/dev-util/spirv-llvm-translator/Manifest
index a4800ecad50d..79748e43f25a 100644
--- a/dev-util/spirv-llvm-translator/Manifest
+++ b/dev-util/spirv-llvm-translator/Manifest
@@ -1,4 +1,3 @@
-DIST spirv-llvm-translator-12.0.0.tar.gz 1378222 BLAKE2B 059409364403316f84521e231bc14cade2875c2b914acea95619b0920ae4f13babb26411b20fead1d7a028320fa3aea637d087d869759cb23e3266753b5b2f46 SHA512 c23ef81802d2bf743564762815d7375a804bdf8029efd7430faea0b48b5e30a9778c1175f52309b522a07aadf8ff77461b912c1fb3b95af9b09273a483eac82a
DIST spirv-llvm-translator-13.0.0-rename-OpConstFunctionPointerINTEL.patch.bz2 3632 BLAKE2B b2c3ed9ff1040fef12cd5b7962c71f2e52febbf1e1d1d06bee079093940c32e67f7c246c92876207f296677bd655f91447d0ce837f191cd0d4cfb66adfb11a62 SHA512 bba6a9b838ebf0bd29f5fa906fefcecdb1b3832b15ac1af8a1ed86da0e988385172b1a51468a4d8d97352c4a57c3e224f12d7e24b7a202a38353e2dbd3a2c27c
DIST spirv-llvm-translator-13.0.0.tar.gz 1436324 BLAKE2B 254450f153a0f0d7c0a75005705f4a7d90effa1e6bcde0d6b931195e4a925ddc34896e66b686c55583d50ab99a9e1e45ad1c0600f7fa4eaa2039642460e9b711 SHA512 1ce7a38c2c3447249e19d50063a7a2acf32699905572950e4f102d8ce1680785433035154b7b55782d5a56211a50e042aef775836f37c33fe847b347a02b5a04
DIST spirv-llvm-translator-14.0.0.tar.gz 1482704 BLAKE2B f88eb8f4cd652c448e465605ec8c34bb80f87f1269c244b33be542ae98ef97ea04a759b9cd9fed0814f4360733d7560d301d2b8d586706d1ca988b4524526aeb SHA512 5659149a380ceef7acdcb274bcad9b23e4817bf88e795e0a8464dfe14fbd102dbf7199cbe67eb611a16d3a411c7a1b8afc6f0eef61fec5a2b8f9fba06748bcb1
diff --git a/dev-util/spirv-llvm-translator/files/spirv-llvm-translator-8.0.0.1-no_pkgconfig_files.patch b/dev-util/spirv-llvm-translator/files/spirv-llvm-translator-8.0.0.1-no_pkgconfig_files.patch
deleted file mode 100644
index 66e81dc3b20d..000000000000
--- a/dev-util/spirv-llvm-translator/files/spirv-llvm-translator-8.0.0.1-no_pkgconfig_files.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Do not install pkgconfig data files, pkg-config does not presently look at
-/usr/lib/llvm/.../pkgconfig and putting them in /usr/lib*/pkgconfig would
-cause collisions between slots.
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -66,11 +66,3 @@
- DESTINATION
- ${CMAKE_INSTALL_PREFIX}/include/LLVMSPIRVLib
- )
--
--configure_file(LLVMSPIRVLib.pc.in ${CMAKE_BINARY_DIR}/LLVMSPIRVLib.pc @ONLY)
--install(
-- FILES
-- ${CMAKE_BINARY_DIR}/LLVMSPIRVLib.pc
-- DESTINATION
-- ${CMAKE_INSTALL_PREFIX}/lib${LLVM_LIBDIR_SUFFIX}/pkgconfig
--)
diff --git a/dev-util/spirv-llvm-translator/spirv-llvm-translator-12.0.0.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-12.0.0.ebuild
deleted file mode 100644
index 5b4c466b706f..000000000000
--- a/dev-util/spirv-llvm-translator/spirv-llvm-translator-12.0.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-
-inherit cmake-multilib flag-o-matic llvm
-
-MY_PN="SPIRV-LLVM-Translator"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Bi-directional translator between SPIR-V and LLVM IR"
-HOMEPAGE="https://github.com/KhronosGroup/SPIRV-LLVM-Translator"
-SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="UoI-NCSA"
-SLOT="12"
-KEYWORDS="amd64"
-IUSE="test +tools"
-
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/${MY_P}"
-
-COMMON="sys-devel/clang:12=[${MULTILIB_USEDEP}]"
-DEPEND="${COMMON}"
-RDEPEND="${COMMON}"
-BDEPEND="test? ( dev-python/lit )"
-
-REQUIRED_USE="test? ( tools )"
-
-LLVM_MAX_SLOT=12
-
-src_prepare() {
- append-flags -fPIC
- cmake_src_prepare
-}
-
-multilib_src_configure() {
- local mycmakeargs=(
- -DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
- -DLLVM_BUILD_TOOLS=$(usex tools "ON" "OFF")
- $(usex test "-DLLVM_INCLUDE_TESTS=ON" "")
- )
- cmake_src_configure
-}
-
-multilib_src_test() {
- # Some tests fail on amd64 when ABI==x86
- if multilib_is_native_abi; then
- lit "${BUILD_DIR}/test" || die "Error running tests for ABI ${ABI}"
- fi
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/spirv-llvm-translator/, dev-util/spirv-llvm-translator/files/
@ 2023-05-04 6:54 Michał Górny
0 siblings, 0 replies; 6+ messages in thread
From: Michał Górny @ 2023-05-04 6:54 UTC (permalink / raw
To: gentoo-commits
commit: 0fdb4d178e8a25d512d190c2cbef06c9b7a3dacb
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu May 4 06:54:02 2023 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu May 4 06:54:24 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fdb4d17
dev-util/spirv-llvm-translator: Fix tests to use LD_LIBRARY_PATH
Fix tests to use LD_LIBRARY_PATH to test the freshly built library
instead of the previous version already installed to the system.
Closes: https://bugs.gentoo.org/905654
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
...rv-llvm-translator-16.0.0-ld_library_path.patch | 63 ++++++++++++++++++++++
.../spirv-llvm-translator-16.0.0.ebuild | 5 +-
2 files changed, 67 insertions(+), 1 deletion(-)
diff --git a/dev-util/spirv-llvm-translator/files/spirv-llvm-translator-16.0.0-ld_library_path.patch b/dev-util/spirv-llvm-translator/files/spirv-llvm-translator-16.0.0-ld_library_path.patch
new file mode 100644
index 000000000000..3068cd535005
--- /dev/null
+++ b/dev-util/spirv-llvm-translator/files/spirv-llvm-translator-16.0.0-ld_library_path.patch
@@ -0,0 +1,63 @@
+From c2133b18cb48b9bb9c47897b16d64c5f0547cde6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Thu, 4 May 2023 08:44:25 +0200
+Subject: [PATCH] [test] Use LD_LIBRARY_PATH to ensure that a new lib is used
+ (#1989)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Add the library `BINARY_DIR` to `LD_LIBRARY_PATH` to ensure that
+the freshly built `libLLVMSPIRVLib.so` is tested. Otherwise, llvm-spirv
+spawned by the test suite may use the previously installed
+`libLLVMSPIRVLib.so`.
+
+I have noticed the problem after rebuilding LLVM with
+`-DLLVM_ENABLE_ASSSERTIONS=ON`. This meant that the previous version
+of `libLLVMSPIRVLib.so` now crashed, effectively causing the test suite
+to fail incorrectly.
+
+Signed-off-by: Michał Górny <mgorny@gentoo.org>
+---
+ test/CMakeLists.txt | 1 +
+ test/lit.cfg.py | 3 ++-
+ test/lit.site.cfg.py.in | 1 +
+ 3 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
+index 235f6d0a0..355baffb8 100644
+--- a/test/CMakeLists.txt
++++ b/test/CMakeLists.txt
+@@ -3,6 +3,7 @@ llvm_canonicalize_cmake_booleans(SPIRV_SKIP_DEBUG_INFO_TESTS)
+
+ # required by lit.site.cfg.py.in
+ get_target_property(LLVM_SPIRV_DIR llvm-spirv BINARY_DIR)
++get_target_property(LLVM_SPIRV_LIB_DIR LLVMSPIRVLib BINARY_DIR)
+ set(LLVM_SPIRV_TEST_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
+
+ if(SPIRV_TOOLS_FOUND AND NOT SPIRV-Tools-tools_FOUND)
+diff --git a/test/lit.cfg.py b/test/lit.cfg.py
+index 4b66412c3..fd8d3f94c 100644
+--- a/test/lit.cfg.py
++++ b/test/lit.cfg.py
+@@ -76,6 +76,7 @@
+ else:
+ config.substitutions.append(('spirv-val', ':'))
+
++llvm_config.with_system_environment('LD_LIBRARY_PATH')
+ if using_spirv_tools:
+- llvm_config.with_system_environment('LD_LIBRARY_PATH')
+ llvm_config.with_environment('LD_LIBRARY_PATH', config.spirv_tools_lib_dir, append_path=True)
++llvm_config.with_environment('LD_LIBRARY_PATH', config.llvm_spirv_lib_dir, append_path=True)
+diff --git a/test/lit.site.cfg.py.in b/test/lit.site.cfg.py.in
+index a01f2bb34..fdc4f4319 100644
+--- a/test/lit.site.cfg.py.in
++++ b/test/lit.site.cfg.py.in
+@@ -6,6 +6,7 @@ config.llvm_src_root = "@LLVM_SOURCE_DIR@"
+ config.llvm_obj_root = "@LLVM_BINARY_DIR@"
+ config.llvm_tools_dir = "@LLVM_TOOLS_DIR@"
+ config.llvm_spirv_dir = "@LLVM_SPIRV_DIR@"
++config.llvm_spirv_lib_dir = "@LLVM_SPIRV_LIB_DIR@"
+ config.llvm_libs_dir = "@LLVM_LIBS_DIR@"
+ config.llvm_shlib_dir = "@SHLIBDIR@"
+ config.llvm_plugin_ext = "@LLVM_PLUGIN_EXT@"
diff --git a/dev-util/spirv-llvm-translator/spirv-llvm-translator-16.0.0.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-16.0.0.ebuild
index 133019091e6e..fd9d9851fd82 100644
--- a/dev-util/spirv-llvm-translator/spirv-llvm-translator-16.0.0.ebuild
+++ b/dev-util/spirv-llvm-translator/spirv-llvm-translator-16.0.0.ebuild
@@ -34,7 +34,10 @@ BDEPEND="
test? ( dev-python/lit )
"
-PATCHES=( "${FILESDIR}/${PN}-16.0.0-llvm-link-llvm-dylib.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-16.0.0-llvm-link-llvm-dylib.patch"
+ "${FILESDIR}/${PN}-16.0.0-ld_library_path.patch"
+)
src_prepare() {
append-flags -fPIC
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/spirv-llvm-translator/, dev-util/spirv-llvm-translator/files/
@ 2024-03-15 23:59 Conrad Kostecki
0 siblings, 0 replies; 6+ messages in thread
From: Conrad Kostecki @ 2024-03-15 23:59 UTC (permalink / raw
To: gentoo-commits
commit: 5258471ddf31bf452c44ee0402b0ec73c8ddc3a0
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 15 22:44:46 2024 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Fri Mar 15 23:58:55 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5258471d
dev-util/spirv-llvm-translator: fix compilation with newer headers
Closes: https://bugs.gentoo.org/924132
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
...v-llvm-translator-15.0.0-intel-capability.patch | 77 ++++++++++++++++++++++
.../spirv-llvm-translator-15.0.0-r1.ebuild | 4 +-
2 files changed, 80 insertions(+), 1 deletion(-)
diff --git a/dev-util/spirv-llvm-translator/files/spirv-llvm-translator-15.0.0-intel-capability.patch b/dev-util/spirv-llvm-translator/files/spirv-llvm-translator-15.0.0-intel-capability.patch
new file mode 100644
index 000000000000..612a493fbed6
--- /dev/null
+++ b/dev-util/spirv-llvm-translator/files/spirv-llvm-translator-15.0.0-intel-capability.patch
@@ -0,0 +1,77 @@
+diff --git a/include/LLVMSPIRVExtensions.inc b/include/LLVMSPIRVExtensions.inc
+index 8eaf24de..695a5d85 100644
+--- a/include/LLVMSPIRVExtensions.inc
++++ b/include/LLVMSPIRVExtensions.inc
+@@ -38,6 +38,7 @@ EXT(SPV_INTEL_variable_length_array)
+ EXT(SPV_INTEL_fp_fast_math_mode)
+ EXT(SPV_INTEL_fpga_cluster_attributes)
+ EXT(SPV_INTEL_loop_fuse)
++EXT(SPV_INTEL_long_composites)
+ EXT(SPV_INTEL_long_constant_composite)
+ EXT(SPV_INTEL_optnone)
+ EXT(SPV_INTEL_fpga_dsp_control)
+diff --git a/lib/SPIRV/libSPIRV/SPIRVEntry.h b/lib/SPIRV/libSPIRV/SPIRVEntry.h
+index b43cd892..8be8d1b9 100644
+--- a/lib/SPIRV/libSPIRV/SPIRVEntry.h
++++ b/lib/SPIRV/libSPIRV/SPIRVEntry.h
+@@ -901,7 +901,7 @@ public:
+ }
+
+ SPIRVCapVec getRequiredCapability() const override {
+- return getVec(CapabilityLongConstantCompositeINTEL);
++ return getVec(CapabilityLongCompositesINTEL);
+ }
+
+ llvm::Optional<ExtensionID> getRequiredExtension() const override {
+diff --git a/lib/SPIRV/libSPIRV/SPIRVNameMapEnum.h b/lib/SPIRV/libSPIRV/SPIRVNameMapEnum.h
+index 88071dd7..3ba1cc38 100644
+--- a/lib/SPIRV/libSPIRV/SPIRVNameMapEnum.h
++++ b/lib/SPIRV/libSPIRV/SPIRVNameMapEnum.h
+@@ -591,7 +591,7 @@ template <> inline void SPIRVMap<Capability, std::string>::init() {
+ add(CapabilityGroupNonUniformRotateKHR, "GroupNonUniformRotateKHR");
+ add(CapabilityAtomicFloat32AddEXT, "AtomicFloat32AddEXT");
+ add(CapabilityAtomicFloat64AddEXT, "AtomicFloat64AddEXT");
+- add(CapabilityLongConstantCompositeINTEL, "LongConstantCompositeINTEL");
++ add(CapabilityLongCompositesINTEL, "LongCompositesINTEL");
+ add(CapabilityOptNoneINTEL, "OptNoneINTEL");
+ add(CapabilityAtomicFloat16AddEXT, "AtomicFloat16AddEXT");
+ add(CapabilityDebugInfoModuleINTEL, "DebugInfoModuleINTEL");
+diff --git a/test/SpecConstants/long-spec-const-composite.ll b/test/SpecConstants/long-spec-const-composite.ll
+index 974a0776..4510a1e6 100644
+--- a/test/SpecConstants/long-spec-const-composite.ll
++++ b/test/SpecConstants/long-spec-const-composite.ll
+@@ -11,7 +11,7 @@
+ target datalayout = "e-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128-v192:256-v256:256-v512:512-v1024:1024-n8:16:32:64"
+ target triple = "spir64-unknown-unknown"
+
+-; CHECK-SPIRV: Capability LongConstantCompositeINTEL
++; CHECK-SPIRV: Capability LongCompositesINTEL
+ ; CHECK-SPIRV: Extension "SPV_INTEL_long_constant_composite"
+ ; CHECK-SPIRV-DAG: Decorate [[First:[0-9]+]] SpecId 0
+ ; CHECK-SPIRV-DAG: Decorate [[Last:[0-9]+]] SpecId 65548
+diff --git a/test/long-constant-array.ll b/test/long-constant-array.ll
+index 03b33771..d0b4c3b3 100644
+--- a/test/long-constant-array.ll
++++ b/test/long-constant-array.ll
+@@ -9,7 +9,7 @@
+ ; TODO: run validator once it supports the extension
+ ; RUNx: spirv-val %t.spv
+
+-; CHECK-SPIRV: Capability LongConstantCompositeINTEL
++; CHECK-SPIRV: Capability LongCompositesINTEL
+ ; CHECK-SPIRV: Extension "SPV_INTEL_long_constant_composite"
+ ; CHECK-SPIRV: TypeInt [[TInt:[0-9]+]] 8
+ ; CHECK-SPIRV: Constant {{[0-9]+}} [[ArrSize:[0-9]+]] 78000
+diff --git a/test/long-type-struct.ll b/test/long-type-struct.ll
+index b9478f0f..a1cdfc6b 100644
+--- a/test/long-type-struct.ll
++++ b/test/long-type-struct.ll
+@@ -10,7 +10,7 @@
+
+ ; RUN: not llvm-spirv %t.bc -o %t.spv 2>&1 | FileCheck %s --check-prefix=CHECK-ERROR
+
+-; CHECK-SPIRV: Capability LongConstantCompositeINTEL
++; CHECK-SPIRV: Capability LongCompositesINTEL
+ ; CHECK-SPIRV: Extension "SPV_INTEL_long_constant_composite"
+ ; CHECK-SPIRV: TypeForwardPointer [[TFwdPtr:[0-9]+]]
+ ; CHECK-SPIRV: TypeInt [[TInt:[0-9]+]]
diff --git a/dev-util/spirv-llvm-translator/spirv-llvm-translator-15.0.0-r1.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-15.0.0-r1.ebuild
index 71e848b4a204..bdefd6ed9703 100644
--- a/dev-util/spirv-llvm-translator/spirv-llvm-translator-15.0.0-r1.ebuild
+++ b/dev-util/spirv-llvm-translator/spirv-llvm-translator-15.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -35,6 +35,8 @@ BDEPEND="
)
"
+PATCHES=( "${FILESDIR}"/${PN}-15.0.0-intel-capability.patch )
+
src_prepare() {
append-flags -fPIC
cmake_src_prepare
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-03-15 23:59 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-02-27 14:42 [gentoo-commits] repo/gentoo:master commit in: dev-util/spirv-llvm-translator/, dev-util/spirv-llvm-translator/files/ Conrad Kostecki
-- strict thread matches above, loose matches on Subject: below --
2024-03-15 23:59 Conrad Kostecki
2023-05-04 6:54 Michał Górny
2022-04-24 22:35 Conrad Kostecki
2021-02-27 14:39 Conrad Kostecki
2019-05-01 16:52 Marek Szuba
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox