* [gentoo-commits] repo/gentoo:master commit in: dev-util/intel-graphics-compiler/files/
@ 2023-04-01 19:13 Conrad Kostecki
0 siblings, 0 replies; 2+ messages in thread
From: Conrad Kostecki @ 2023-04-01 19:13 UTC (permalink / raw
To: gentoo-commits
commit: 4db89b71fd7b5a871edf62bdc97d4e494601b3a7
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sun Mar 26 09:11:28 2023 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sat Apr 1 19:11:04 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4db89b71
dev-util/intel-graphics-compiler: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/30349
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
...phics-compiler-1.0.12504.5-vectorcompiler.patch | 165 ---------------------
1 file changed, 165 deletions(-)
diff --git a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.12504.5-vectorcompiler.patch b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.12504.5-vectorcompiler.patch
deleted file mode 100644
index ec75efc22b97..000000000000
--- a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.12504.5-vectorcompiler.patch
+++ /dev/null
@@ -1,165 +0,0 @@
-From 753a6a4efd5fcb42a86a5f62b64c29393513d807 Mon Sep 17 00:00:00 2001
-From: Victor Mustya <victor.mustya@intel.com>
-Date: Thu, 29 Dec 2022 05:03:39 +0000
-Subject: [PATCH] Fix open source build for some configurations
-
-When building for some Linux distros, cmake configures IGC to build all
-the libraries as shared by default. So we have to explicitly configure
-all the libraries as static or object.
----
- IGC/Options/CMakeLists.txt | 2 +-
- IGC/VectorCompiler/CMCL/lib/Support/CMakeLists.txt | 2 +-
- IGC/VectorCompiler/lib/BiF/CMakeLists.txt | 2 +-
- IGC/VectorCompiler/lib/Driver/CMakeLists.txt | 2 +-
- IGC/VectorCompiler/lib/GenXCodeGen/CMakeLists.txt | 2 +-
- IGC/VectorCompiler/lib/GenXCodeGen/TargetInfo/CMakeLists.txt | 2 +-
- IGC/VectorCompiler/lib/GenXOpts/CMakeLists.txt | 2 +-
- IGC/VectorCompiler/lib/InternalIntrinsics/CMakeLists.txt | 2 +-
- IGC/VectorCompiler/lib/Support/CMakeLists.txt | 2 +-
- IGC/VectorCompiler/lib/Utils/GenX/CMakeLists.txt | 2 +-
- IGC/VectorCompiler/lib/Utils/General/CMakeLists.txt | 2 +-
- 11 files changed, 11 insertions(+), 11 deletions(-)
-
-diff --git a/IGC/Options/CMakeLists.txt b/IGC/Options/CMakeLists.txt
-index 834d74d37ce..1dc079d1c1e 100644
---- a/IGC/Options/CMakeLists.txt
-+++ b/IGC/Options/CMakeLists.txt
-@@ -6,7 +6,7 @@
- #
- #============================ end_copyright_notice =============================
-
--add_library(IGCOptions "")
-+add_library(IGCOptions STATIC "")
-
- add_subdirectory(src)
- add_subdirectory(include/igc/Options)
-diff --git a/IGC/VectorCompiler/CMCL/lib/Support/CMakeLists.txt b/IGC/VectorCompiler/CMCL/lib/Support/CMakeLists.txt
-index ebab3db0005..eda77667ddf 100644
---- a/IGC/VectorCompiler/CMCL/lib/Support/CMakeLists.txt
-+++ b/IGC/VectorCompiler/CMCL/lib/Support/CMakeLists.txt
-@@ -12,7 +12,7 @@ set(CM_CL_SUPPORT_SOURCES
- InitializePasses.cpp
- )
-
--add_library(CMCLSupport ${CM_CL_SUPPORT_SOURCES})
-+add_library(CMCLSupport STATIC ${CM_CL_SUPPORT_SOURCES})
-
- # LLVM dependencies
- igc_get_llvm_targets(LLVM_LIBS
-diff --git a/IGC/VectorCompiler/lib/BiF/CMakeLists.txt b/IGC/VectorCompiler/lib/BiF/CMakeLists.txt
-index 6235fc1d21e..c439f334a98 100644
---- a/IGC/VectorCompiler/lib/BiF/CMakeLists.txt
-+++ b/IGC/VectorCompiler/lib/BiF/CMakeLists.txt
-@@ -275,7 +275,7 @@ add_custom_target(VCBiFPreparation
- ${SPIRV_EXEC_BUILTINS_SRC_PATH}
- ${SPIRV_ATOMIC_BUILTINS_SRC_PATH})
-
--add_library(VCEmbeddedBiF
-+add_library(VCEmbeddedBiF OBJECT
- ${PRINTF_OCL_32_CPP_PATH}
- ${PRINTF_OCL_64_CPP_PATH}
- ${PRINTF_ZE_32_CPP_PATH}
-diff --git a/IGC/VectorCompiler/lib/Driver/CMakeLists.txt b/IGC/VectorCompiler/lib/Driver/CMakeLists.txt
-index 74e4e661e74..fc14937a1c6 100644
---- a/IGC/VectorCompiler/lib/Driver/CMakeLists.txt
-+++ b/IGC/VectorCompiler/lib/Driver/CMakeLists.txt
-@@ -11,7 +11,7 @@ set(DRIVER_SOURCES
- SPIRVWrapper.cpp
- )
-
--add_library(VCDriver ${DRIVER_SOURCES})
-+add_library(VCDriver STATIC ${DRIVER_SOURCES})
- igc_get_llvm_targets(LLVM_LIBS
- Analysis
- BitReader
-diff --git a/IGC/VectorCompiler/lib/GenXCodeGen/CMakeLists.txt b/IGC/VectorCompiler/lib/GenXCodeGen/CMakeLists.txt
-index 185a7533a89..4c3eada26fb 100644
---- a/IGC/VectorCompiler/lib/GenXCodeGen/CMakeLists.txt
-+++ b/IGC/VectorCompiler/lib/GenXCodeGen/CMakeLists.txt
-@@ -88,7 +88,7 @@ set(CODEGEN_SOURCES
- GenXFixInvalidFuncName.cpp
- )
-
--add_library(VCCodeGen ${CODEGEN_SOURCES})
-+add_library(VCCodeGen STATIC ${CODEGEN_SOURCES})
- add_dependencies(VCCodeGen
- GenXUtilBuild
- GenXCommonTableGen_target
-diff --git a/IGC/VectorCompiler/lib/GenXCodeGen/TargetInfo/CMakeLists.txt b/IGC/VectorCompiler/lib/GenXCodeGen/TargetInfo/CMakeLists.txt
-index dca9455f464..8a0b66f7b55 100644
---- a/IGC/VectorCompiler/lib/GenXCodeGen/TargetInfo/CMakeLists.txt
-+++ b/IGC/VectorCompiler/lib/GenXCodeGen/TargetInfo/CMakeLists.txt
-@@ -10,7 +10,7 @@ set(INFO_SOURCES
- GenXTargetInfo.cpp
- )
-
--add_library(VCTargetInfo ${INFO_SOURCES})
-+add_library(VCTargetInfo OBJECT ${INFO_SOURCES})
-
- igc_get_llvm_targets(LLVM_LIBS Support)
-
-diff --git a/IGC/VectorCompiler/lib/GenXOpts/CMakeLists.txt b/IGC/VectorCompiler/lib/GenXOpts/CMakeLists.txt
-index 44ebf851d6e..0f56a8c1a26 100644
---- a/IGC/VectorCompiler/lib/GenXOpts/CMakeLists.txt
-+++ b/IGC/VectorCompiler/lib/GenXOpts/CMakeLists.txt
-@@ -27,7 +27,7 @@ set(OPT_SOURCES
- CMPacketize/PacketBuilder_misc.cpp
- )
-
--add_library(VCTransforms ${OPT_SOURCES})
-+add_library(VCTransforms OBJECT ${OPT_SOURCES})
-
- igc_get_llvm_targets(LLVM_LIBS
- Analysis
-diff --git a/IGC/VectorCompiler/lib/InternalIntrinsics/CMakeLists.txt b/IGC/VectorCompiler/lib/InternalIntrinsics/CMakeLists.txt
-index 332d74e25dd..060cccc91fc 100644
---- a/IGC/VectorCompiler/lib/InternalIntrinsics/CMakeLists.txt
-+++ b/IGC/VectorCompiler/lib/InternalIntrinsics/CMakeLists.txt
-@@ -14,7 +14,7 @@ set(LLVM_COMPONENTS
- )
-
- igc_get_llvm_targets(LLVM_LIBS ${LLVM_COMPONENTS})
--add_library(VCInternalIntrinsics
-+add_library(VCInternalIntrinsics OBJECT
- InternalIntrinsics.cpp
- )
-
-diff --git a/IGC/VectorCompiler/lib/Support/CMakeLists.txt b/IGC/VectorCompiler/lib/Support/CMakeLists.txt
-index 047f2528761..12b7bb62cca 100644
---- a/IGC/VectorCompiler/lib/Support/CMakeLists.txt
-+++ b/IGC/VectorCompiler/lib/Support/CMakeLists.txt
-@@ -15,7 +15,7 @@ set(SUPPORT_SOURCES
- PassPrinters.cpp
- )
-
--add_library(VCSupport ${SUPPORT_SOURCES})
-+add_library(VCSupport OBJECT ${SUPPORT_SOURCES})
- igc_get_llvm_targets(LLVM_LIBS
- Support
- Core
-diff --git a/IGC/VectorCompiler/lib/Utils/GenX/CMakeLists.txt b/IGC/VectorCompiler/lib/Utils/GenX/CMakeLists.txt
-index e5a7bff2392..b77547c6bcd 100644
---- a/IGC/VectorCompiler/lib/Utils/GenX/CMakeLists.txt
-+++ b/IGC/VectorCompiler/lib/Utils/GenX/CMakeLists.txt
-@@ -21,7 +21,7 @@ set(GENX_UTILS_SOURCES
- TransformArgCopy.cpp
- )
-
--add_library(VCGenXUtils ${GENX_UTILS_SOURCES})
-+add_library(VCGenXUtils OBJECT ${GENX_UTILS_SOURCES})
- igc_get_llvm_targets(LLVM_LIBS
- Core
- Support
-diff --git a/IGC/VectorCompiler/lib/Utils/General/CMakeLists.txt b/IGC/VectorCompiler/lib/Utils/General/CMakeLists.txt
-index 873d45e8025..8408828f748 100644
---- a/IGC/VectorCompiler/lib/Utils/General/CMakeLists.txt
-+++ b/IGC/VectorCompiler/lib/Utils/General/CMakeLists.txt
-@@ -16,7 +16,7 @@ set(GENERAL_UTILS_SOURCES
- IndexFlattener.cpp
- )
-
--add_library(VCGeneralUtils ${GENERAL_UTILS_SOURCES})
-+add_library(VCGeneralUtils OBJECT ${GENERAL_UTILS_SOURCES})
- igc_get_llvm_targets(LLVM_LIBS
- Core
- Support
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/intel-graphics-compiler/files/
@ 2023-10-11 23:59 Conrad Kostecki
0 siblings, 0 replies; 2+ messages in thread
From: Conrad Kostecki @ 2023-10-11 23:59 UTC (permalink / raw
To: gentoo-commits
commit: 8830054b879fa06e9ae0f5a1330ca563faef5241
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 11 23:55:59 2023 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Wed Oct 11 23:55:59 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8830054b
dev-util/intel-graphics-compiler: update vc patch
Update VC patch to use upstreams commited version.
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../intel-graphics-compiler-1.0.14062.11-vc.patch | 52 ++++++++++++++--------
1 file changed, 33 insertions(+), 19 deletions(-)
diff --git a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.14062.11-vc.patch b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.14062.11-vc.patch
index 778505f08068..7fc8e4f82c11 100644
--- a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.14062.11-vc.patch
+++ b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.14062.11-vc.patch
@@ -1,59 +1,73 @@
+From 9be3363c1f9f97627566d88a56e6e612a74691b3 Mon Sep 17 00:00:00 2001
+From: Igor Gorban <igor.gorban@intel.com>
+Date: Mon, 9 Oct 2023 13:13:57 +0000
+Subject: [PATCH] Fix regression in release-build
+
+Thanks @frantisekz for point and triage problem
+---
+ .../lib/GenXCodeGen/GenXSimdCFConformance.cpp | 15 ++++++++++-----
+ 1 file changed, 10 insertions(+), 5 deletions(-)
+
+diff --git a/IGC/VectorCompiler/lib/GenXCodeGen/GenXSimdCFConformance.cpp b/IGC/VectorCompiler/lib/GenXCodeGen/GenXSimdCFConformance.cpp
+index ade15972379d..c5572e758833 100644
--- a/IGC/VectorCompiler/lib/GenXCodeGen/GenXSimdCFConformance.cpp
+++ b/IGC/VectorCompiler/lib/GenXCodeGen/GenXSimdCFConformance.cpp
-@@ -1867,11 +1867,13 @@ void GenXSimdCFConformance::ensureConformance() {
+@@ -1867,11 +1867,12 @@ void GenXSimdCFConformance::ensureConformance() {
IID != GenXIntrinsic::genx_simdcf_unmask &&
IID != GenXIntrinsic::genx_simdcf_remask) {
EMValsStack.insert(*i);
-+ #ifdef DEBUG_VERBOSE_ON
++#if !defined(NDEBUG) || defined(LLVM_ENABLE_DUMP)
LLVM_DEBUG(if (auto *Inst = dyn_cast<Instruction>(i->getValue())) {
auto FuncName = Inst->getFunction()->getName();
- dbgs() << "Entry EMVals " << FuncName << " - ";
- i->getValue()->dump();
+- dbgs() << "Entry EMVals " << FuncName << " - ";
+- i->getValue()->dump();
++ dbgs() << "Entry EMVals " << FuncName << " - " << *Inst << "\n";
});
-+ #endif
++#endif
}
}
for (auto i = EMVals.begin(), e = EMVals.end(); i != e; ++i) {
-@@ -1919,6 +1921,7 @@ void GenXSimdCFConformance::ensureConformance() {
+@@ -1919,6 +1920,7 @@ void GenXSimdCFConformance::ensureConformance() {
// been identified in the early pass, unless passes in between have
// transformed the code in an unexpected way that has made the simd CF
// non-conformant. Give an error here if this has happened.
-+ #ifdef DEBUG_VERBOSE_ON
++#if !defined(NDEBUG) || defined(LLVM_ENABLE_DUMP)
if (!GotosToLower.empty()) {
dbgs() << "Not empty GotosToLower:";
for (auto *Dump : GotosToLower)
-@@ -1929,6 +1932,7 @@ void GenXSimdCFConformance::ensureConformance() {
+@@ -1929,6 +1931,7 @@ void GenXSimdCFConformance::ensureConformance() {
for (auto *Dump : JoinsToLower)
Dump->dump();
}
-+ #endif
++#endif
IGC_ASSERT_EXIT_MESSAGE(
GotosToLower.empty(),
"unexpected non-conformant SIMD CF in late SIMD CF conformance pass");
-@@ -2460,8 +2464,10 @@ static bool checkAllUsesAreSelectOrWrRegion(Value *V) {
+@@ -2460,9 +2463,9 @@ static bool checkAllUsesAreSelectOrWrRegion(Value *V) {
auto User2 = cast<Instruction>(ui2->getUser());
unsigned OpNum = ui2->getOperandNo();
++ui2;
-+ #ifdef DEBUG_VERBOSE_ON
- LLVM_DEBUG(dbgs() << "checkAllUsesAreSelectOrWrRegion: for user ";
- User2->dump());
-+ #endif
-
+- LLVM_DEBUG(dbgs() << "checkAllUsesAreSelectOrWrRegion: for user ";
+- User2->dump());
+-
++#if !defined(NDEBUG) || defined(LLVM_ENABLE_DUMP)
++ LLVM_DEBUG(dbgs() << "checkAllUsesAreSelectOrWrRegion: for user " << *User2 << "\n");
++#endif
if (isa<SelectInst>(User2))
continue;
-@@ -3006,12 +3012,14 @@ bool GenXSimdCFConformance::getConnectedVals(
+
+@@ -3006,12 +3009,14 @@ bool GenXSimdCFConformance::getConnectedVals(
}
} else {
if (!UsersToLower.empty()) {
-+ #ifdef DEBUG_VERBOSE_ON
++#if !defined(NDEBUG) || defined(LLVM_ENABLE_DUMP)
LLVM_DEBUG(dbgs() << "getConnectedVals: find bad users:\n";
for (auto &BadUser
: UsersToLower) {
dbgs() << " ";
BadUser.dump();
});
-+ #endif
++#endif
return false;
}
}
---
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-10-11 23:59 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-10-11 23:59 [gentoo-commits] repo/gentoo:master commit in: dev-util/intel-graphics-compiler/files/ Conrad Kostecki
-- strict thread matches above, loose matches on Subject: below --
2023-04-01 19:13 Conrad Kostecki
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox