gentoo auto-resync : 05:10:2023 - 17:54:48

3 files changed, 62 insertions, 1 deletions

diff --git a/dev-util/intel-graphics-compiler/Manifest b/dev-util/intel-graphics-compiler/Manifest
index 0a71296f545e..10c5182a46c5 100644
--- a/dev-util/intel-graphics-compiler/Manifest
+++ b/dev-util/intel-graphics-compiler/Manifest
@@ -1,8 +1,9 @@
+AUX intel-graphics-compiler-1.0.14062.11-vc.patch 2255 BLAKE2B 662a4ceaf48598fb7a8fe1c6f2af2049a1109ca28283610433211414bd8fd20e52d16d1714d8370a480c4743f84e3f698cf6f45e619f01eb8c069cb6f817a9e6 SHA512 a600b551f4e6c3f24af073ca602c286aa09daa87ee370903f3eceec43c66ebba64fb07c137181d0245a82ccae1470862c33058ff4b669c297b0808247b47a065
 AUX intel-graphics-compiler-1.0.8173-opencl-clang_version.patch 1807 BLAKE2B ec6aac8c78d7584e043a258585cbae6218fd8aa167d853e1eea96313298df7347ab7652ec2bf83199129e07e534d52fcd200858036e3d0af2c4f79ff249104f2 SHA512 1a0db341aab280aa205965dfc82d17b29f681bde76932f8291243afad985523f601c7279b1fb772ebc4d9197e5016941a1ad07cea2b6d7199710a7ee22fd81dc
 AUX intel-graphics-compiler-1.0.8365-disable-git.patch 1140 BLAKE2B f870def1128c30c3e50a71e9eac39eccbcc9bc798be574324016c6c31ed3a3f82e1499f1aada5a2c475bd6b6c467b1b236635fdd6b5145904bc63dc53f8d75e5 SHA512 d1d53a6f4a47031ec4cdcf3f57c059536ccf571a72929da3d9070487686f91f4202d20c4d626da616250f66b31815b61fafa82b903b1f5157a226ee748097bda
 AUX intel-graphics-compiler-1.0.9-no_Werror.patch 272 BLAKE2B 079fe334413dfddb7681940f2a8920a365e8e72526cfc09ea1c7d218e8b19468f80ea9a215be125b441ee5238d7856b8dec02ebfc4bfd76b1850aa9917da35ef SHA512 d3d27943e84e228b480172b4fe91ba9aed8bb1c98700eb8c8beebafb7f1cc6265279031f56181e67eff74f55e1bbc8ee24bdc4d14fc1200c5aff670ef019410d
 DIST intel-graphics-compiler-1.0.14062.11.tar.gz 8415633 BLAKE2B 1dd65e37a6d2aa7539aa9d5700921ad9c75c3a5cb6a66870adbe9fac888eb16cc772574666f05ce02d165f8954c7b4ebbfbc2ed2008fdd86c5bbb472b95959ae SHA512 0fd2790997268b102ded0af47d4133cf251791c7ecd15758b378a0cdf6d6640d78cc68b2de0b003710a36da4d4750c7fa90eb2ac5aa1702164e46109fafd980d
 DIST intel-graphics-compiler-1.0.15136.4.tar.gz 8942086 BLAKE2B 5008b9d255cd9923de73ef07929215b3e2c14d46c37ee0730d0c25ec1f109bd59fa1178cd7e085cf9b7009cf820cdf29a2a880b9f1c1528f494c300d21535732 SHA512 22c676bec940c91bae0a5cd36f904febbab2e4e60dc8379f2068adb9b1cd2de8d37aa1c66dec2616f1a761e862b58676aa484cdcdf7bdd002222bdc337571bc8
 EBUILD intel-graphics-compiler-1.0.14062.11.ebuild 2655 BLAKE2B 4c078439167bfbd637aa2ae058e3fbe0b7a274217a2f8af9778e0e75bbb727a4f15427aaf849446a50ef30bba4e82e587072e97e2c9369588f6ec91b4dfc3d3e SHA512 0d0f40c58e1751e0e15c2337c3b7f71f6c40afca1e31b93a1fbb13efd8c14666d80ae46a2fc9007cb02b7cdaed085a37e6ebbbab9daa71ef12d643927a8845f9
-EBUILD intel-graphics-compiler-1.0.15136.4-r1.ebuild 2830 BLAKE2B 21429b8daca0e017c6eac88fca960af808cbdc310a4354a05c1f58dcc85cd5e29ab4ba03738c952b3dfb11f26ed2b92713626487b39673f46a4f5531da8d0b04 SHA512 89cd6d90be025a5b8d31d43d462eed4f63e2728dafbc93c8f2645882a79cf4bae07ae6abbc87111a262c8ec6401ca4cf95f2a7d042c14f86c23580fa97f7129b
+EBUILD intel-graphics-compiler-1.0.15136.4-r1.ebuild 2873 BLAKE2B 2fdf3c16fd2bec862082af3b3598315b89bae5697a18d6a5ab03037195b6075a5fbb855d144a040d763b2db03796e994e7733ffaadf1861925bd86e9917325e6 SHA512 3f15da6663232530655d7c5c3b9712f2d578d7139c0a9dad67a2a94ec07462c919289af451f057994e99fc6b7292038cc054b9dd3720cd143da96d9243b26f08
 MISC metadata.xml 682 BLAKE2B c5e74bbb1a5aca5eed7cb75a19820dc9d78d7ef7a15687924d16863a82a535403ca67103ac458d4b86f380244e726a3bd20fb496f8048f999abdf89950a7092c SHA512 d5a35d2104e9aa5caaf903a9f61ca8a8c4f8b5bff3e993c9964dd63196e64b88e3e7bde2e0cff9dcee9c66bdda0cabb43c5ac8c121796626bb0e7f4013929fb3
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
new file mode 100644
index 000000000000..778505f08068
--- /dev/null
+++ b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.14062.11-vc.patch
@@ -0,0 +1,59 @@
+--- a/IGC/VectorCompiler/lib/GenXCodeGen/GenXSimdCFConformance.cpp
++++ b/IGC/VectorCompiler/lib/GenXCodeGen/GenXSimdCFConformance.cpp
+@@ -1867,11 +1867,13 @@ void GenXSimdCFConformance::ensureConformance() {
+         IID != GenXIntrinsic::genx_simdcf_unmask &&
+         IID != GenXIntrinsic::genx_simdcf_remask) {
+       EMValsStack.insert(*i);
++      #ifdef DEBUG_VERBOSE_ON
+       LLVM_DEBUG(if (auto *Inst = dyn_cast<Instruction>(i->getValue())) {
+         auto FuncName = Inst->getFunction()->getName();
+         dbgs() << "Entry EMVals " << FuncName << " - ";
+         i->getValue()->dump();
+       });
++      #endif
+     }
+   }
+   for (auto i = EMVals.begin(), e = EMVals.end(); i != e; ++i) {
+@@ -1919,6 +1921,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 (!GotosToLower.empty()) {
+       dbgs() << "Not empty GotosToLower:";
+       for (auto *Dump : GotosToLower)
+@@ -1929,6 +1932,7 @@ void GenXSimdCFConformance::ensureConformance() {
+       for (auto *Dump : JoinsToLower)
+         Dump->dump();
+     }
++    #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) {
+     auto User2 = cast<Instruction>(ui2->getUser());
+     unsigned OpNum = ui2->getOperandNo();
+     ++ui2;
++    #ifdef DEBUG_VERBOSE_ON
+     LLVM_DEBUG(dbgs() << "checkAllUsesAreSelectOrWrRegion: for user ";
+                User2->dump());
++    #endif
+ 
+     if (isa<SelectInst>(User2))
+       continue;
+@@ -3006,12 +3012,14 @@ bool GenXSimdCFConformance::getConnectedVals(
+     }
+   } else {
+     if (!UsersToLower.empty()) {
++      #ifdef DEBUG_VERBOSE_ON
+       LLVM_DEBUG(dbgs() << "getConnectedVals: find bad users:\n";
+                  for (auto &BadUser
+                       : UsersToLower) {
+                    dbgs() << "    ";
+                    BadUser.dump();
+                  });
++      #endif
+       return false;
+     }
+   }
+--
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.15136.4-r1.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.15136.4-r1.ebuild
index 4af5fe6fad51..96c33faba372 100644
--- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.15136.4-r1.ebuild
+++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.15136.4-r1.ebuild
@@ -48,6 +48,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-1.0.9-no_Werror.patch"
 	"${FILESDIR}/${PN}-1.0.8173-opencl-clang_version.patch"
 	"${FILESDIR}/${PN}-1.0.8365-disable-git.patch"
+	"${FILESDIR}/${PN}-1.0.14062.11-vc.patch"
 )
 
 pkg_setup() {