11 files changed, 64 insertions, 294 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index ce93231b7fce..48e360eb5e0c 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/intel-graphics-compiler/Manifest b/dev-util/intel-graphics-compiler/Manifest
index 97285851ad03..99fce8f6175b 100644
--- a/dev-util/intel-graphics-compiler/Manifest
+++ b/dev-util/intel-graphics-compiler/Manifest
@@ -1,12 +1,9 @@
-AUX intel-graphics-compiler-1.0.11485-fix-BiF-caching.patch 2303 BLAKE2B 3b1e50d823e7e6a95ec9b1dcdc0042a1890e9de1e7e2896ad8505d13fec301f62f7561d0556e5ae46361a0b81925f5fad95a40dfd72c847b9ff97e0e1c529906 SHA512 e9819bea36b88c6615ccc9eed1ff924afc0a7a560d7368a18f815f5dc02b60deced7536d4423bd02355d6e16ac2d91042c8662d8cabf8ed35ab6d099d3a4cc42
 AUX intel-graphics-compiler-1.0.11485-include-opencl-c.patch 507 BLAKE2B 1a777971e4db95a7ac719944f8533d7cb045e2092c452af35c2d5fd7e696ec848ed4777e9653f77627e4ca0fe36f4beffc9a39e3c7a13bda7973af6722238857 SHA512 8aaef1aaf0a6cedcd66e55ee8df0d89d40f3827b28243cc434dbbcadb568d8c1317a0968b57ad0b2a88de4479023a00b1b3b9a65fd34105cebe56fdeb3c30f1b
-AUX intel-graphics-compiler-1.0.11485-update-raytracing-llvm14.patch 8551 BLAKE2B 378e3ffd95097be18b090da1eca2b01f0333e7818cdefd8fe66c92b210bf49c6c85eb5a1a2cfc5c3a76da098ce3cc215df2f0f6faee5c2057cc3912029f4aa12 SHA512 826804a622b29dbf04ba54ced86da7e09d130842975a4381d29261b450d2615de273e9648c289d200e03cd67f8781467b439a4b542dc26ae04120838e0dee790
-AUX intel-graphics-compiler-1.0.11485-wrap-getNumArgOperands.patch 1046 BLAKE2B 1452cb35b9b198e7f7425bc9eb98603173f2c0984ee6a27d32750341699103f15d289ceffcc6e48c9165575e9e1f8d019911555b1bbd16cf967491f637a44501 SHA512 9bdf30a3de62b3da217a76f0f2e25929a3db538851f6ae807a568ffd740a160cb8f8a908ad22d026662c41bffee5b5c418d5d2e3f8f46cb565fa529f9d5bbf7c
 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.11485.tar.gz 8831925 BLAKE2B 7e2bcb37b4c34bb01788a8d75fc42498223b6193421cb726c21ce7949181757a10d112ae151736cd9283ba6ed8f0625597fb1f2a61229a7352e7f1f5ec34d1d0 SHA512 03fb571fdd61daea3a5c61ff75a146bd98b9b92dfd8bc1957143fe127977f5111df680ac86769d3c1fa1801ba2012b600b1ff844b318ce64460f2d042c4ae65b
 DIST intel-graphics-compiler-1.0.11702.1.tar.gz 8734601 BLAKE2B 7cc8a4f9fc820d822c3b435d172ca27145d916fd25fedf20d13b2d7041cba36fc4416e17307ab0cbf6b9785f5958a53c58486fb6fb4776025b696f5dfb195161 SHA512 cd7d27a3a13462517c3e75c43d7d951afa53ef77875f479304da43b93fd40ae19680c11dc5bcf2ec3fecf6dbe56daa954ccb88b9f99f3af4c53d3141ef0b93f5
-EBUILD intel-graphics-compiler-1.0.11485-r2.ebuild 2635 BLAKE2B a0f4542bf8343a23887c729fab4588480c11bcf884dd6b458fdc07c35765661d58f6e5bde6fd7bfe643754062b57165311d16b85b5c82f25cd8887576b6a73fb SHA512 8ca420c146f9332a7294fb8b4dcb7da42c5b4c9d782479500925e4ac0377e50a2edde0b05ff3582792664badcf0b483f8e7e7b96ccc12a6cf738098ca4bafa9a
-EBUILD intel-graphics-compiler-1.0.11702.1.ebuild 2461 BLAKE2B fb2245758e2a5e0e86fbcabe1f4deaa3c0fb6997bb657ab5d88cd8b2b424e10287b960397bd63f5efe8bbcbb89aa7de07c3970205566e9d9e01d3ca20ffb0771 SHA512 03b3c9ce763c91ed7d8e455b3d911d1ebc8a5a91e80e8632527fe8705d6fb362e219b7aa7a6f6e219e01db765dd572d91206251c8043940c4aab2cdc2fe6c802
+DIST intel-graphics-compiler-1.0.12149.1.tar.gz 8874232 BLAKE2B b6195741282290561ee669574b19a9d96dd9695ea6358932f4c54946ff7b2a0315f905e9445419349131c2a424b630b8197a944bbd46a3232bd841be50f4f2e8 SHA512 1c9f2a6e119713173db527d8dc891269606db2a57a9c0043c82556e79a77d83bab31b732557e8130f36b99a54b551e8ff6d6104b3d75ef081d9f16811abbe8db
+EBUILD intel-graphics-compiler-1.0.11702.1.ebuild 2460 BLAKE2B f1455841699d2979a7aa495dcaff5eae4db141d04120a003d621fe28288afeba4f42401feb0001abc5c510981dd6e7250c448b062aef4045c97ead0905431a08 SHA512 3714dc24f1535e9d6b3a37cafec8e43a3c411dda037ca485aae48b07f3abcdf3d5769cd8c592c26de990cb2bf0aef301e463e872af30534b3c90b23a64010cb4
+EBUILD intel-graphics-compiler-1.0.12149.1.ebuild 2461 BLAKE2B fb2245758e2a5e0e86fbcabe1f4deaa3c0fb6997bb657ab5d88cd8b2b424e10287b960397bd63f5efe8bbcbb89aa7de07c3970205566e9d9e01d3ca20ffb0771 SHA512 03b3c9ce763c91ed7d8e455b3d911d1ebc8a5a91e80e8632527fe8705d6fb362e219b7aa7a6f6e219e01db765dd572d91206251c8043940c4aab2cdc2fe6c802
 MISC metadata.xml 594 BLAKE2B de9f434fc853417b9d1c6199c7501c9fe702aa68b0eaa0f88d298563431de126fbdc259f0d541e85674b0205444f5d1febf0433b292a6ac40661d62af23457d8 SHA512 b939b315122a5fe3252242ccab8fbf049d9234ee67c6910969c178bcb56fc835bc954380f8c15bab23905ac852fa0fe0640f6ef2ee9d48502ae0e3379d7f7460
diff --git a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.11485-fix-BiF-caching.patch b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.11485-fix-BiF-caching.patch
deleted file mode 100644
index 7ad261e0aa6c..000000000000
--- a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.11485-fix-BiF-caching.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 12c99343388eba6e6275856b25e0fa8978585dfb Mon Sep 17 00:00:00 2001
-From: Marcin Naczk <marcin.naczk@intel.com>
-Date: Mon, 13 Jun 2022 08:28:24 +0000
-Subject: [PATCH]  Find OpenCl-c.h when clang is take from system.
-
-Find OpenCl-c.h when clang is take from system.
----
- IGC/cmake/igc_find_opencl_clang.cmake | 24 +++++++++++++++---------
- 1 file changed, 15 insertions(+), 9 deletions(-)
-
-diff --git a/IGC/cmake/igc_find_opencl_clang.cmake b/IGC/cmake/igc_find_opencl_clang.cmake
-index dc8924fb7ee..0a54ac68249 100644
---- a/IGC/cmake/igc_find_opencl_clang.cmake
-+++ b/IGC/cmake/igc_find_opencl_clang.cmake
-@@ -94,19 +94,25 @@ if(CCLANG_FROM_SYSTEM)
-   else()
-     set_property(TARGET opencl-clang-lib PROPERTY "IMPORTED_LOCATION" "${SYSTEM_COMMON_CLANG}")
-   endif()
--  find_program(CLANG_GE7 clang-${LLVM_VERSION_MAJOR})
--  if(CLANG_GE7)
--    message(STATUS "[IGC] Found clang-${LLVM_VERSION_MAJOR} executable: ${CLANG_GE7}")
-+  find_program(CLANG_EXE clang-${LLVM_VERSION_MAJOR})
-+  if(CLANG_EXE)
-+    message(STATUS "[IGC] Found clang-${LLVM_VERSION_MAJOR} executable: ${CLANG_EXE}")
- 
-     add_executable(clang-tool IMPORTED GLOBAL)
--    set_property(TARGET clang-tool PROPERTY "IMPORTED_LOCATION" "${CLANG_GE7}")
-+    set_property(TARGET clang-tool PROPERTY "IMPORTED_LOCATION" "${CLANG_EXE}")
-     set(CL_OPTIONS "-finclude-default-header")
--    if(LLVM_VERSION_MAJOR VERSION_EQUAL 7)
--      message(WARNING "[IGC] : clang-7 should be patched with VME patch (https://reviews.llvm.org/D51484). Assuming that it is. If not, please add -DVME_TYPES_DEFINED=FALSE.")
--    endif()
--  else(CLANG_GE7)
-+
-+    # Get parent dir of the location of CLANG_EXE
-+    get_filename_component(CLANG_EXE_PARENT_DIR ${CLANG_EXE} DIRECTORY)
-+    file(GLOB_RECURSE opencl-header ${CLANG_EXE_PARENT_DIR}/../*opencl-c.h)
-+    if(opencl-header)
-+      message(STATUS "[IGC] Found opencl-c.h: ${opencl-header}")
-+    else(opencl-header)
-+      message(FATAL_ERROR "[IGC] : Couldn't find opencl-c.h, please provide it.")
-+    endif(opencl-header)
-+  else(CLANG_EXE)
-     message(FATAL_ERROR "[IGC] : Couldn't find clang-${LLVM_VERSION_MAJOR} executable, please install it.")
--  endif(CLANG_GE7)
-+  endif(CLANG_EXE)
- ###
- #2. CCLANG_BUILD_PREBUILDS - use prebuilt opencl-clang toolchain
- elseif(${CCLANG_BUILD_PREBUILDS})
diff --git a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.11485-update-raytracing-llvm14.patch b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.11485-update-raytracing-llvm14.patch
deleted file mode 100644
index 248f8244e32f..000000000000
--- a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.11485-update-raytracing-llvm14.patch
+++ /dev/null
@@ -1,186 +0,0 @@
-From d9535cc5c3e54b21d56c492d4e21cb13c80b9b7a Mon Sep 17 00:00:00 2001
-From: Artem Gindinson <artem.gindinson@intel.com>
-Date: Wed, 22 Jun 2022 11:53:02 +0000
-Subject: [PATCH]  Update RayTracing for full LLVM 14 buildability
-
-- Address further casting issues
-- Use pre-existing LLVM wrappers for function argument manipulations
-- Create & use LLVM wrappers for `AAQueryInfo` and
-  `CallBase::getRetDereferenceableBytes()`
----
- IGC/AdaptorCommon/RayTracing/AllocaTracking.cpp          | 3 ++-
- IGC/AdaptorCommon/RayTracing/InlineDataPass.cpp          | 3 ++-
- IGC/AdaptorCommon/RayTracing/LowerIntersectionAnyHit.cpp | 2 +-
- IGC/AdaptorCommon/RayTracing/RTSpillShrinkPass.cpp       | 4 ++--
- IGC/AdaptorCommon/RayTracing/RayTracingFinalizePass.cpp  | 4 ++--
- IGC/AdaptorCommon/RayTracing/StackIDSchedulingPass.cpp   | 3 ++-
- IGC/AdaptorCommon/TypesLegalizationPass.cpp              | 2 +-
- .../include/llvmWrapper/Analysis/AliasAnalysis.h         | 7 +++++++
- IGC/WrapperLLVM/include/llvmWrapper/IR/InstrTypes.h      | 9 +++++++++
- 9 files changed, 28 insertions(+), 9 deletions(-)
-
-diff --git a/IGC/AdaptorCommon/RayTracing/AllocaTracking.cpp b/IGC/AdaptorCommon/RayTracing/AllocaTracking.cpp
-index b5ad27e32ca..67cf302495c 100644
---- a/IGC/AdaptorCommon/RayTracing/AllocaTracking.cpp
-+++ b/IGC/AdaptorCommon/RayTracing/AllocaTracking.cpp
-@@ -19,6 +19,7 @@ SPDX-License-Identifier: MIT
- #include "common/LLVMWarningsPush.hpp"
- #include <llvm/IR/Instruction.h>
- #include <llvm/IR/IntrinsicInst.h>
-+#include <llvmWrapper/IR/Instructions.h>
- #include "common/LLVMWarningsPop.hpp"
- 
- using namespace llvm;
-@@ -129,7 +130,7 @@ void rewriteTypes(
-             "Only handles void right now!");
- 
-         SmallVector<Type*, 4> Tys;
--        for (auto &Op : II->arg_operands())
-+        for (auto &Op : IGCLLVM::args(II))
-             Tys.push_back(Op->getType());
- 
-         auto* NewFTy = FunctionType::get(
-diff --git a/IGC/AdaptorCommon/RayTracing/InlineDataPass.cpp b/IGC/AdaptorCommon/RayTracing/InlineDataPass.cpp
-index 5e4df4e1a86..9433340d259 100644
---- a/IGC/AdaptorCommon/RayTracing/InlineDataPass.cpp
-+++ b/IGC/AdaptorCommon/RayTracing/InlineDataPass.cpp
-@@ -46,6 +46,7 @@ SPDX-License-Identifier: MIT
- #include <vector>
- #include "common/LLVMWarningsPush.hpp"
- #include <llvm/IR/InstIterator.h>
-+#include <llvmWrapper/IR/InstrTypes.h>
- #include "common/LLVMWarningsPop.hpp"
- 
- using namespace llvm;
-@@ -155,7 +156,7 @@ bool BindlessInlineDataPass::runOnModule(Module &M)
-                 // the size of the Shader Identifier + the size of the Local arguments
-                 const uint64_t dereferenceable_size =
-                     sizeof(ShaderIdentifier) +
--                    local_buffer_ptr->getDereferenceableBytes(AttributeList::ReturnIndex);
-+                    IGCLLVM::getRetDereferenceableBytes(local_buffer_ptr);
- 
-                 // Return a CallInst* representing the InlinedData intrinsic call
-                 // In the shader dumps,
-diff --git a/IGC/AdaptorCommon/RayTracing/LowerIntersectionAnyHit.cpp b/IGC/AdaptorCommon/RayTracing/LowerIntersectionAnyHit.cpp
-index 8b6bba69f23..2c3a98d04e3 100644
---- a/IGC/AdaptorCommon/RayTracing/LowerIntersectionAnyHit.cpp
-+++ b/IGC/AdaptorCommon/RayTracing/LowerIntersectionAnyHit.cpp
-@@ -449,7 +449,7 @@ CallInst* LowerIntersectionAnyHit::codeGenReportHit(
-                 CustomHitAttrPtr,
-                 4,
-                 Attrs,
--                std::min(4U, DL.getABITypeAlignment(AttrTy->getPointerElementType())),
-+                std::min(4U, (unsigned)DL.getABITypeAlignment(AttrTy->getPointerElementType())),
-                 IRB.getInt64(DL.getTypeAllocSize(AttrTy->getPointerElementType())));
-         }
- 
-diff --git a/IGC/AdaptorCommon/RayTracing/RTSpillShrinkPass.cpp b/IGC/AdaptorCommon/RayTracing/RTSpillShrinkPass.cpp
-index 4d42b32af36..d8d7ac3c54f 100644
---- a/IGC/AdaptorCommon/RayTracing/RTSpillShrinkPass.cpp
-+++ b/IGC/AdaptorCommon/RayTracing/RTSpillShrinkPass.cpp
-@@ -61,9 +61,9 @@ class RTSpillShrinkPass : public FunctionPass
- 
-     unsigned getAlignment(const DataLayout& DL, StoreInst* ST) const
-     {
--        unsigned Align = ST->getAlignment();
-+        unsigned Align = (unsigned)ST->getAlignment();
-         if (Align == 0)
--            Align = DL.getABITypeAlignment(ST->getType());
-+            Align = (unsigned)DL.getABITypeAlignment(ST->getType());
-         return Align;
-     }
- 
-diff --git a/IGC/AdaptorCommon/RayTracing/RayTracingFinalizePass.cpp b/IGC/AdaptorCommon/RayTracing/RayTracingFinalizePass.cpp
-index 87549a6ce85..797e77a548d 100644
---- a/IGC/AdaptorCommon/RayTracing/RayTracingFinalizePass.cpp
-+++ b/IGC/AdaptorCommon/RayTracing/RayTracingFinalizePass.cpp
-@@ -114,7 +114,7 @@ bool RayTracingFinalizePass::runOnModule(Module &M)
-             {
-                 // Temporary WA to ensure we don't page fault on unaligned
-                 // acceses.
--                uint32_t Align = LI->getAlignment();
-+                uint32_t Align = (uint32_t)LI->getAlignment();
-                 if (Align == 0)
-                     Align = (uint32_t)DL.getTypeAllocSize(LI->getType());
- 
-@@ -125,7 +125,7 @@ bool RayTracingFinalizePass::runOnModule(Module &M)
-             {
-                 // Temporary WA to ensure we don't page fault on unaligned
-                 // acceses.
--                uint32_t Align = SI->getAlignment();
-+                uint32_t Align = (uint32_t)SI->getAlignment();
-                 if (Align == 0)
-                     Align = (uint32_t)DL.getTypeAllocSize(
-                         SI->getValueOperand()->getType());
-diff --git a/IGC/AdaptorCommon/RayTracing/StackIDSchedulingPass.cpp b/IGC/AdaptorCommon/RayTracing/StackIDSchedulingPass.cpp
-index db5490267fd..d352b67a50f 100644
---- a/IGC/AdaptorCommon/RayTracing/StackIDSchedulingPass.cpp
-+++ b/IGC/AdaptorCommon/RayTracing/StackIDSchedulingPass.cpp
-@@ -49,6 +49,7 @@ SPDX-License-Identifier: MIT
- #include <llvm/IR/Dominators.h>
- #include <llvm/Analysis/PostDominators.h>
- #include <llvm/Analysis/LoopInfo.h>
-+#include "llvmWrapper/Analysis/AliasAnalysis.h"
- #include "llvmWrapper/Analysis/MemoryLocation.h"
- #include "common/LLVMWarningsPop.hpp"
- 
-@@ -175,7 +176,7 @@ BasicBlock* StackIDSchedulingPass::schedule(
- ModRefInfo StackIDSchedulingPass::getModRefInfo(
-     const CallBase* Call, const MemoryLocation& Loc)
- {
--    AAQueryInfo AAQIP;
-+    AAQueryInfo AAQIP = IGCLLVM::makeAAQueryInfo();
-     return AA->getModRefInfo(Call, Loc, AAQIP);
- }
- 
-diff --git a/IGC/AdaptorCommon/TypesLegalizationPass.cpp b/IGC/AdaptorCommon/TypesLegalizationPass.cpp
-index c3570f39d31..10da29ee242 100644
---- a/IGC/AdaptorCommon/TypesLegalizationPass.cpp
-+++ b/IGC/AdaptorCommon/TypesLegalizationPass.cpp
-@@ -207,7 +207,7 @@ TypesLegalizationPass::ResolveValue( Instruction *ip,Value *val,SmallVector<unsi
-   {
-     IGCLLVM::IRBuilder<> builder( ld );
-     Value* gep = CreateGEP( builder,ld->getOperand( 0 ),indices );
--    unsigned alignment = ld->getAlignment();
-+    unsigned alignment = (unsigned)ld->getAlignment();
-     unsigned pointerTypeSize = gep->getType()->getPointerElementType()->getScalarSizeInBits() / 8;
-     if ( alignment && pointerTypeSize == alignment )
-       return builder.CreateAlignedLoad( gep, IGCLLVM::getAlign(alignment) );
-diff --git a/IGC/WrapperLLVM/include/llvmWrapper/Analysis/AliasAnalysis.h b/IGC/WrapperLLVM/include/llvmWrapper/Analysis/AliasAnalysis.h
-index 873886cc860..385c04db970 100644
---- a/IGC/WrapperLLVM/include/llvmWrapper/Analysis/AliasAnalysis.h
-+++ b/IGC/WrapperLLVM/include/llvmWrapper/Analysis/AliasAnalysis.h
-@@ -19,6 +19,13 @@ namespace IGCLLVM
- #else
-   using AliasResultEnum = llvm::AliasResult::Kind;
- #endif
-+inline llvm::AAQueryInfo makeAAQueryInfo() {
-+#if LLVM_VERSION_MAJOR >= 14
-+  return llvm::AAQueryInfo(new llvm::SimpleCaptureInfo());
-+#else
-+  return llvm::AAQueryInfo();
-+#endif
-+}
- }
- 
- #endif
-diff --git a/IGC/WrapperLLVM/include/llvmWrapper/IR/InstrTypes.h b/IGC/WrapperLLVM/include/llvmWrapper/IR/InstrTypes.h
-index 569eece3fb5..1050c842271 100644
---- a/IGC/WrapperLLVM/include/llvmWrapper/IR/InstrTypes.h
-+++ b/IGC/WrapperLLVM/include/llvmWrapper/IR/InstrTypes.h
-@@ -50,6 +50,15 @@ namespace IGCLLVM
-         CI->addFnAttr(Kind);
- #else
-         CI->addAttribute(llvm::AttributeList::FunctionIndex, Kind);
-+#endif
-+    }
-+
-+    inline uint64_t getRetDereferenceableBytes(llvm::CallBase* Call)
-+    {
-+#if LLVM_VERSION_MAJOR >= 14
-+        return Call->getRetDereferenceableBytes();
-+#else
-+        return Call->getDereferenceableBytes(llvm::AttributeList::ReturnIndex);
- #endif
-     }
- }
diff --git a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.11485-wrap-getNumArgOperands.patch b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.11485-wrap-getNumArgOperands.patch
deleted file mode 100644
index 23754ccb6b4b..000000000000
--- a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.11485-wrap-getNumArgOperands.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 1d5ceafdbc005f3adc58be5af1dc92f068908e16 Mon Sep 17 00:00:00 2001
-From: Artem Gindinson <artem.gindinson@intel.com>
-Date: Mon, 20 Jun 2022 12:38:04 +0000
-Subject: [PATCH]  Wrap CallInst::getNumArgOperands calls for LLVM 14
-
-Rework all remaining call sites to rely on the already-existing wrapper
-function.
----
- IGC/Compiler/CISACodeGen/HFpackingOpt.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/IGC/Compiler/CISACodeGen/HFpackingOpt.cpp b/IGC/Compiler/CISACodeGen/HFpackingOpt.cpp
-index 69d6151f8bf..e24362d7791 100644
---- a/IGC/Compiler/CISACodeGen/HFpackingOpt.cpp
-+++ b/IGC/Compiler/CISACodeGen/HFpackingOpt.cpp
-@@ -825,7 +825,7 @@ bool HFpackingOpt::findStoreSequence(std::vector<Instruction*>& path, std::vecto
-         uint srciCount = inst->getNumOperands();
-         if (CallInst* cinst = dyn_cast<CallInst>(inst))
-         {
--            srciCount = cinst->getNumArgOperands();
-+            srciCount = IGCLLVM::getNumArgOperands(cinst);
-         }
- 
-         for (uint srci = 0; srci < srciCount; srci++)
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.11702.1.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.11702.1.ebuild
index 40b31434451c..63b90728f8c7 100644
--- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.11702.1.ebuild
+++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.11702.1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${PN}-${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="debug"
 
 DEPEND="
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.11485-r2.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.12149.1.ebuild
index cbacc91fa4d3..40b31434451c 100644
--- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.11485-r2.ebuild
+++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.12149.1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${PN}-${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="~amd64"
 IUSE="debug"
 
 DEPEND="
@@ -39,9 +39,6 @@ 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.11485-fix-BiF-caching.patch"
-	"${FILESDIR}/${PN}-1.0.11485-update-raytracing-llvm14.patch"
-	"${FILESDIR}/${PN}-1.0.11485-wrap-getNumArgOperands.patch"
 	"${FILESDIR}/${PN}-1.0.11485-include-opencl-c.patch"
 )
 
diff --git a/dev-util/opencl-headers/Manifest b/dev-util/opencl-headers/Manifest
index eb344516b617..059907ca24ae 100644
--- a/dev-util/opencl-headers/Manifest
+++ b/dev-util/opencl-headers/Manifest
@@ -1,7 +1,5 @@
-DIST opencl-headers-2021.06.30.tar.gz 59866 BLAKE2B 7bf7b7d6f69178ae14d4ba5b012d134e0d0005acd8aa6c1c09c6d34b531ccf74381af072aaf85fa41ab1d8cb783b8c3c5fc528ddef078ba8dbb91708849fb0d0 SHA512 9d3ddf3a02ff4de00686f7e8cc7eef9f75e3c0e68920e787941c2d8a3ad895ae46d7c717894527a56144febf19ccc25ed733018d3d683509b1d8cc368d99b8ba
 DIST opencl-headers-2022.01.04.tar.gz 62719 BLAKE2B 6791a679a09248746dd6b23d46001a8b6fcb3efc0a5d7c35be14463543ca08e57d24d1a4ab3ec765c315f44e849aa9c52d574f521ee1f660f9232979e511a9b3 SHA512 7c47486f40db16b8264f7e1febedd09c0481308eb15b5f4c4b5ff37c4ffb7697ae79427d221babe921704681942cd152b676b3bed660ba79d2901a48228d14ae
 DIST opencl-headers-2022.05.18.tar.gz 64518 BLAKE2B c1e0c3011e4ef226a5fc4601a65c78dfae20e86f9327e7cbda23bb16fbd95a450a28d5dbe3b90332ce9ebdbc3b108dbae3433b8e79883f777f8d5e9e6add375c SHA512 36a8637d22379eb7f83d44152cb34ff955134b9efb66a2d0973596b4cc38e1690a53972bee86f460350e80f13dbc775d24708960bf9e828f8e2c6e3d6358946e
-EBUILD opencl-headers-2021.06.30.ebuild 502 BLAKE2B dbc937549550a6ccba57cc73ef86aea42fdc941aa5e0d24c4c0c3c94cbded49bfdc79765684330053156bcc36807043d51916c4e16ddb1e64f3e6b36d811f581 SHA512 1390696b1c4251cd94d6235897843433f4f3ef6966f6a0ea711b475f499d9933bc4a02ee96d177b28d681fa66404e984789d3cbb05524129fcf43a3a7758a886
 EBUILD opencl-headers-2022.01.04.ebuild 533 BLAKE2B 4746bf5e79327fcac1800dedf670adabc4f0fa632fdb82a539099e189e3189b215b05089551353c9b058a0ba5c8a73c506805d115a103d9a5332ffeeb06a8ab2 SHA512 6f3988e78a6956532e5555321c1aff2aa2cca3e7db79107d9295bb9a97501f46955326a55d665cfb32dac8c20d178b8abfee9b4b4064a3470f3b63a7106714fd
 EBUILD opencl-headers-2022.05.18-r1.ebuild 612 BLAKE2B 4b244d57ce703f199807a38fb294d067d7adb515ae7694164c0d7c84c32bd1258f7fcb029d228503c5500a3b0b85638696149533d4323652c5d5c6a866210b44 SHA512 0ce7e1888259d6d217b26de88a7224b48f0114336d885dfa1ff841a70f5769c09b143dcad67c8b3c4f9681faa937c14ea5a9c8f1643f0d5d0ee0130e3c83d1e8
 MISC metadata.xml 1055 BLAKE2B ac96e1bf07e353236170d3678541555b7d901984266dfd1356456db90effe430e6a042afc0b9b5a7f51d0e9cfbcef0fbf66fb46de82fdc8cc1cfa29c6cfd61d0 SHA512 6233610591851e415ab0354ca900dfdfa14fa2442e56094d547420ce710942be86c701820c3a63e2c6f070b74c0801f92bbe9ed6c7f2a5cae406f74b81acd86a
diff --git a/dev-util/opencl-headers/opencl-headers-2021.06.30.ebuild b/dev-util/opencl-headers/opencl-headers-2021.06.30.ebuild
deleted file mode 100644
index 8ad07c4d0f42..000000000000
--- a/dev-util/opencl-headers/opencl-headers-2021.06.30.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN="OpenCL-Headers"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Unified C language headers for the OpenCL API"
-HOMEPAGE="https://github.com/KhronosGroup/OpenCL-Headers"
-SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	insinto /usr/include
-	doins -r "${S}"/CL
-}
diff --git a/dev-util/spirv-llvm-translator/Manifest b/dev-util/spirv-llvm-translator/Manifest
index 5fdc68ec99c8..fffb8758dc4e 100644
--- a/dev-util/spirv-llvm-translator/Manifest
+++ b/dev-util/spirv-llvm-translator/Manifest
@@ -1,6 +1,8 @@
 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
+DIST spirv-llvm-translator-15.0.0.tar.gz 1515145 BLAKE2B 1f93b55f8934ce7dbc9416b82f7bd544d16e95be795047e914d0c303ec90965eae03ab3522b3c92d6cffb1fe00bed78a4bb74085d3da21c14b68ad3fbe53113c SHA512 8a6ddddf326dad96c1c5749ebf03e63e6be60592dccd307f7a35be668cec2b4f58c2f089854aeefa37398c3a97dad6bf92a6ceb892da27b5cf9d4ae1aa41dd06
 EBUILD spirv-llvm-translator-13.0.0-r2.ebuild 1393 BLAKE2B 05cd645ace5d0e889e8199f74d2ff6f342cfc7c60091fcd339f99ace5c80f78a2be38db366ebc46dffb4527f25415e322df5e4ba175a622d39feb6431828c1fe SHA512 1275e9bcece435865e6ac9050426470f7f7c934023cabc30b1b0065e6401294943201f0df7b70553f6a3f3cd3039d7c8c39776bab15b936e3d9dca8f4eefc804
 EBUILD spirv-llvm-translator-14.0.0-r1.ebuild 1203 BLAKE2B 0bf581cbfcda0ae078bbcbb4792a19415b326d3bc14cac4c2e616ff2a16f8d15f3b98d852a6d40df4ce0121ae4a331ee49733c676eff862ef0fea270d1fa3b43 SHA512 db59082eb283cf789cbb9ed9604890bc4079932e45e4f3dcb98fd106dc9757b7f496eac1c2c0aaba7184bef2900efd12ce4c4d3609ce84b3c792c5174d6ae8d5
+EBUILD spirv-llvm-translator-15.0.0.ebuild 1204 BLAKE2B 56f1e6f1e5feb1940cc0f3ef0da1aacca9ffa4131a91492e4b0add2b45660441585fadefa67ad9aabd9d6939730ce7eaa0122247dc5b453ddb8e6240e01838bf SHA512 46f61d6e52ef057e29e6b3b8ad04c121740fb4f98ffd7dad71bc8c675ed3bf4ecf3f580f47b25766c2a5b76fd216b1ca915cc368e44e48f041a16590c5b1d277
 MISC metadata.xml 696 BLAKE2B 8d5fd20aa6ce0ed9c7660ac356f9c2274c8262680faf04aa647890044e8c48703366aa59a6c9b638105a5269ae2bcc7d1ccdb01fbb268b2054d6dce7a9cb875b SHA512 c0ce5f3a5eefced8c2a3fe8988009f4ae2dab5c1a93d5f908d24e2445696799dc937cde7f1ec29237ce44a653d496a74b246ac9d65ab132c33c5334990a6238e
diff --git a/dev-util/spirv-llvm-translator/spirv-llvm-translator-15.0.0.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-15.0.0.ebuild
new file mode 100644
index 000000000000..d46120e8f99d
--- /dev/null
+++ b/dev-util/spirv-llvm-translator/spirv-llvm-translator-15.0.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_MAX_SLOT="15"
+MY_PN="SPIRV-LLVM-Translator"
+MY_P="${MY_PN}-${PV}"
+
+inherit cmake flag-o-matic llvm
+
+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"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="UoI-NCSA"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE="test +tools"
+REQUIRED_USE="test? ( tools )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-util/spirv-headers
+	sys-devel/clang:${SLOT}
+	sys-devel/llvm:${SLOT}
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	virtual/pkgconfig
+	test? ( dev-python/lit )
+"
+
+src_prepare() {
+	append-flags -fPIC
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCCACHE_ALLOWED="OFF"
+		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
+		-DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR="${BROOT}/usr/include/spirv"
+		-DLLVM_BUILD_TOOLS=$(usex tools "ON" "OFF")
+		-DLLVM_SPIRV_INCLUDE_TESTS=$(usex test "ON" "OFF")
+		-Wno-dev
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	lit "${BUILD_DIR}/test" || die
+}