diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-09-26 03:05:23 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-09-26 03:05:23 +0100 |
commit | bc9ef8effb5fec9ca32cb92dcd35672461c0153b (patch) | |
tree | b5db7e5a5b0a9411637d49fe2089a8793152cbfd /dev-util/intel-graphics-compiler | |
parent | 5b14ea000f5782ac047162ffc35ef8c3c0648b4a (diff) |
gentoo auto-resync : 26:09:2022 - 03:05:22
Diffstat (limited to 'dev-util/intel-graphics-compiler')
-rw-r--r-- | dev-util/intel-graphics-compiler/Manifest | 9 | ||||
-rw-r--r-- | dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.11485-fix-BiF-caching.patch | 49 | ||||
-rw-r--r-- | dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.11485-update-raytracing-llvm14.patch | 186 | ||||
-rw-r--r-- | dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.11485-wrap-getNumArgOperands.patch | 24 | ||||
-rw-r--r-- | dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.11702.1.ebuild | 2 | ||||
-rw-r--r-- | dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.12149.1.ebuild (renamed from dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.11485-r2.ebuild) | 5 |
6 files changed, 5 insertions, 270 deletions
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" ) |