diff --git a/devel/intel-graphics-compiler/Makefile b/devel/intel-graphics-compiler/Makefile index 6a5ee188c8bd..7e5935ba28cd 100644 --- a/devel/intel-graphics-compiler/Makefile +++ b/devel/intel-graphics-compiler/Makefile @@ -1,47 +1,54 @@ PORTNAME= intel-graphics-compiler DISTVERSIONPREFIX= igc- -DISTVERSION= 1.0.7041 +DISTVERSION= 1.0.8173 CATEGORIES= devel +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +PATCHFILES+= b7f29ee948b9.patch:-p1 # https://github.com/intel/intel-graphics-compiler/pull/189 +PATCHFILES+= a69ee09275fe.patch:-p1 # https://github.com/intel/intel-graphics-compiler/pull/189 +PATCHFILES+= 12c4fbc2b511.patch:-p1 # https://github.com/intel/intel-graphics-compiler/pull/189 + MAINTAINER= jbeich@FreeBSD.org COMMENT= Intel Graphics Compiler for OpenCL LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.md ONLY_FOR_ARCHS= amd64 i386 ONLY_FOR_ARCHS_REASON= Only Intel GPUs on x86 are supported LIB_DEPENDS= libopencl-clang.so:devel/opencl-clang USES= bison cmake compiler:c++17-lang python:build USE_GITHUB= yes USE_LDCONFIG= yes GH_ACCOUNT= intel -GH_TUPLE= intel:vc-intrinsics:069ced1:vcintrin/../vc-intrinsics +GH_TUPLE= intel:vc-intrinsics:05d3f3d:vcintrin/../vc-intrinsics CMAKE_OFF= INSTALL_SPIRVDLL CFLAGS+= -Wno-macro-redefined # __fastcall PLIST_SUB= ARCH_SUFX=${ARCH:S/i386/32/:S/amd//:S/x86_//} post-patch: # lang/python* don't install unsuffixed symlinks @${REINPLACE_CMD} -i .python \ -e '/EXECUTABLE/s/"python"/"${PYTHON_CMD:T}"/' \ -e '/IGC_PYTHON/s/"python"/"${PYTHON_CMD:T}"/' \ ${WRKSRC}/IGC/CMakeLists.txt \ ${WRKSRC}/IGC/BiFModule/linux/CMakeLists.txt # devel/llvm* have different naming from upstream under PATH @${REINPLACE_CMD} -e '/clang-\$$/s//clang$$/' \ + -e '/llvm-\$$/s//llvm$$/' \ + ${WRKSRC}/IGC/cmake/igc_find_liblldELF.cmake \ ${WRKSRC}/IGC/cmake/igc_find_opencl_clang.cmake # No need to abort on every benign warning enabled by default @${REINPLACE_CMD} -e 's/"-Werror"//; /-Werror/d' \ ${WRKSRC}/IGC/CMakeLists.txt pre-configure: # Only one libLLVM can be loaded, so use the same version as devel/opencl-clang @for f in ${LOCALBASE}/lib/libopencl-clang.so.*; do \ ${REINPLACE_CMD} "/set.*LLVM.*VERSION/s/\".*\"/\"$${f##*so.}\"/" \ ${WRKSRC}/external/llvm/llvm_preferred_version.cmake; \ done .include diff --git a/devel/intel-graphics-compiler/distinfo b/devel/intel-graphics-compiler/distinfo index 99c09654eeae..c4a07aa66e33 100644 --- a/devel/intel-graphics-compiler/distinfo +++ b/devel/intel-graphics-compiler/distinfo @@ -1,5 +1,11 @@ -TIMESTAMP = 1617824048 -SHA256 (intel-intel-graphics-compiler-igc-1.0.7041_GH0.tar.gz) = 299494ff885c8f0452c250867586be937a1aff9d46e6ff61a954bfc1e3a3c406 -SIZE (intel-intel-graphics-compiler-igc-1.0.7041_GH0.tar.gz) = 7470694 -SHA256 (intel-vc-intrinsics-069ced1_GH0.tar.gz) = f64cae99ad5a7c31c7ee7403d139be2654b4c6b08e21dd8db3feef939463652f -SIZE (intel-vc-intrinsics-069ced1_GH0.tar.gz) = 124312 +TIMESTAMP = 1626602428 +SHA256 (intel-intel-graphics-compiler-igc-1.0.8173_GH0.tar.gz) = 20794f1451b971c82ed824dd65723a6c562158e8061644e596b53417e9daa045 +SIZE (intel-intel-graphics-compiler-igc-1.0.8173_GH0.tar.gz) = 7471884 +SHA256 (intel-vc-intrinsics-05d3f3d_GH0.tar.gz) = 7d3df322a91ea9d95ef606b9d5a2580d6deb426f779ba921ae3a799a5e642c4f +SIZE (intel-vc-intrinsics-05d3f3d_GH0.tar.gz) = 126560 +SHA256 (b7f29ee948b9.patch) = f47c5d7b37d4ae264eef37646afbcbaadd370ad91035895630bd52da7cf82452 +SIZE (b7f29ee948b9.patch) = 1199 +SHA256 (a69ee09275fe.patch) = e3f293844338d50e6c6d8f0213377637dc1eefc79bfd07c92e889ed8a8d8dd1f +SIZE (a69ee09275fe.patch) = 1160 +SHA256 (12c4fbc2b511.patch) = e7570987a542f8688641b2172c87f75de0b114cde6d083f21ef27431193e648c +SIZE (12c4fbc2b511.patch) = 4376 diff --git a/devel/intel-graphics-compiler/files/patch-llvm11 b/devel/intel-graphics-compiler/files/patch-llvm11 deleted file mode 100644 index 6ff712a80272..000000000000 --- a/devel/intel-graphics-compiler/files/patch-llvm11 +++ /dev/null @@ -1,115 +0,0 @@ -IGC/Compiler/ConvertMSAAPayloadTo16Bit.cpp:156:35: error: no member named 'getVectorElementType' in 'llvm::Type'; did you mean 'getPointerElementType'? - ldmcs->getType()->getVectorElementType() == m_builder->getInt32Ty()) - ^~~~~~~~~~~~~~~~~~~~ - getPointerElementType -/usr/local/llvm11/include/llvm/IR/Type.h:370:9: note: 'getPointerElementType' declared here - Type *getPointerElementType() const { - ^ -IGC/Compiler/ConvertMSAAPayloadTo16Bit.cpp:160:61: error: no member named 'getVectorNumElements' in 'llvm::Type' - uint ldmcsNumOfElements = ldmcs->getType()->getVectorNumElements(); - ~~~~~~~~~~~~~~~~ ^ -IGC/Compiler/ConvertMSAAPayloadTo16Bit.cpp:161:71: error: no member named 'getVectorNumElements' in 'llvm::Type' - uint newLdmcsNumOfElements = new_mcs_call->getType()->getVectorNumElements(); - ~~~~~~~~~~~~~~~~~~~~~~~ ^ - -IGC/Compiler/Legalizer/InstPromoter.cpp:402:42: error: no member named 'getVectorNumElements' in 'llvm::Type' - for (unsigned i = 0; i < DestTy->getVectorNumElements(); i++) - ~~~~~~ ^ - -IGC/Compiler/Optimizer/OpenCLPasses/WIFuncs/WIFuncResolution.cpp:308:27: error: no member named 'getVectorNumElements' in 'llvm::Type' - Size *= DataType->getVectorNumElements(); - ~~~~~~~~ ^ - -IGC/VectorCompiler/lib/GenXCodeGen/GenXDebugInfo.cpp:528:33: error: no viable conversion from 'llvm::StringRef' to 'const std::string' (aka 'const basic_string, allocator>') - auto *VF = VB.GetVISAKernel(F->getName()); - ^~~~~~~~~~~~ -IGC/VectorCompiler/lib/GenXCodeGen/GenXPatternMatch.cpp:2203:5: error: no matching function for call to 'RecursivelyDeleteTriviallyDeadInstructions' - RecursivelyDeleteTriviallyDeadInstructions(ToErase); - ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -/usr/local/llvm11/include/llvm/Transforms/Utils/Local.h:161:6: note: candidate function not viable: no known conversion from 'SmallVector' to 'llvm::Value *' for 1st argument -bool RecursivelyDeleteTriviallyDeadInstructions( - ^ -/usr/local/llvm11/include/llvm/Transforms/Utils/Local.h:173:6: note: candidate function not viable: no known conversion from 'SmallVector' to 'SmallVectorImpl &' for 1st argument -void RecursivelyDeleteTriviallyDeadInstructions( - ^ - ---- IGC/Compiler/ConvertMSAAPayloadTo16Bit.cpp.orig 2021-03-22 09:55:24 UTC -+++ IGC/Compiler/ConvertMSAAPayloadTo16Bit.cpp -@@ -153,12 +153,21 @@ void ConvertMSAAPayloadTo16Bit::visitCallInst(CallInst - // There are uses of ldmcs other then ldms, using vector of int32 type. - // Fix them to use newly created 16bit ldmcs. - if (ldmcs->getType()->isVectorTy() && -+#if LLVM_VERSION_MAJOR < 11 - ldmcs->getType()->getVectorElementType() == m_builder->getInt32Ty()) -+#else -+ cast(ldmcs->getType())->getElementType() == m_builder->getInt32Ty()) -+#endif - { - m_builder->SetInsertPoint(ldmcs); - -+#if LLVM_VERSION_MAJOR < 11 - uint ldmcsNumOfElements = ldmcs->getType()->getVectorNumElements(); - uint newLdmcsNumOfElements = new_mcs_call->getType()->getVectorNumElements(); -+#else -+ uint ldmcsNumOfElements = cast(ldmcs->getType())->getNumElements(); -+ uint newLdmcsNumOfElements = cast(new_mcs_call->getType())->getNumElements(); -+#endif - - // vec of 16bit ints to vec of 32bit ints - Type* newLdmcsVecType = VectorType::get(m_builder->getInt32Ty(), newLdmcsNumOfElements); ---- IGC/Compiler/Legalizer/InstPromoter.cpp.orig 2021-02-08 08:48:29 UTC -+++ IGC/Compiler/Legalizer/InstPromoter.cpp -@@ -399,7 +399,11 @@ bool InstPromoter::visitBitCastInst(BitCastInst& I) { - IRB->CreateBitCast(Val, VectorType::get(DestTy->getScalarType(), N)); - - std::vector Vals; -+#if LLVM_VERSION_MAJOR < 11 - for (unsigned i = 0; i < DestTy->getVectorNumElements(); i++) -+#else -+ for (unsigned i = 0; i < cast(DestTy)->getNumElements(); i++) -+#endif - Vals.push_back(IRB->getInt32(i)); - - Value* Mask = ConstantVector::get(Vals); ---- IGC/Compiler/Optimizer/OpenCLPasses/WIFuncs/WIFuncResolution.cpp.orig 2021-02-07 09:58:11 UTC -+++ IGC/Compiler/Optimizer/OpenCLPasses/WIFuncs/WIFuncResolution.cpp -@@ -305,7 +305,11 @@ static Value* BuildLoadInst(CallInst& CI, unsigned int - auto Size = ElemByteSize; - if (DataType->isVectorTy()) - { -+#if LLVM_VERSION_MAJOR < 11 - Size *= DataType->getVectorNumElements(); -+#else -+ Size *= cast(DataType)->getNumElements(); -+#endif - } - unsigned int AlignedOffset = (Offset / ElemByteSize) * ElemByteSize; - unsigned int LoadByteSize = (Offset == AlignedOffset) ? Size : Size * 2; ---- IGC/VectorCompiler/lib/GenXCodeGen/GenXDebugInfo.cpp.orig 2021-03-28 09:45:11 UTC -+++ IGC/VectorCompiler/lib/GenXCodeGen/GenXDebugInfo.cpp -@@ -525,7 +525,11 @@ void GenXDebugInfo::processFunctionGroup(GenXModule &G - for (auto *F : IndirectlyCalledFunctions) { - LLVM_DEBUG(dbgs() << " F: " << F->getName() << " called indirectly!\n"); - // Each indirectly-called function is compiled into a separate vISA kernel -+#if LLVM_VERSION_MAJOR < 11 - auto *VF = VB.GetVISAKernel(F->getName()); -+#else -+ auto *VF = VB.GetVISAKernel(F->getName().str()); -+#endif - processKernel(ProgramInfo{{BuildFunctionInfo(VF, F)}}); - } - std::vector PrimaryFIs; ---- IGC/VectorCompiler/lib/GenXCodeGen/GenXPatternMatch.cpp.orig 2021-02-15 09:29:30 UTC -+++ IGC/VectorCompiler/lib/GenXCodeGen/GenXPatternMatch.cpp -@@ -2194,7 +2194,11 @@ bool GenXPatternMatch::simplifySelect(Function *F) { - - bool GenXPatternMatch::clearDeadInstructions(Function &F) { - bool Changed = false; -+#if LLVM_VERSION_MAJOR < 11 - SmallVector ToErase; -+#else -+ SmallVector ToErase; -+#endif - for (auto &Inst : instructions(F)) - if (isInstructionTriviallyDead(&Inst)) - ToErase.push_back(&Inst); diff --git a/devel/intel-graphics-compiler/files/patch-unix b/devel/intel-graphics-compiler/files/patch-unix index d6dbb2e61eb2..ef8ba7e0a533 100644 --- a/devel/intel-graphics-compiler/files/patch-unix +++ b/devel/intel-graphics-compiler/files/patch-unix @@ -1,296 +1,296 @@ Relax Linux checks for the code works on any non-Windows platform. CMake Error at IGC/CMakeLists.txt:1974 (message): IGC_OPTION__ARCHITECTURE_TARGET: Target architecture is not specified and cannot be deduced from context. Please specify one, e.g. Windows32, Linux64, Android32, ... --- IGC/cmake/igc_arch_utils.cmake.orig 2021-03-28 09:45:11 UTC +++ IGC/cmake/igc_arch_utils.cmake @@ -48,7 +48,7 @@ function(igc_arch_detect targetArchVarName hostArchVar set(_targetArchitecture "Windows32") endif() # Use system processor set by toolchain or CMake. - elseif(ANDROID OR (CMAKE_SYSTEM_NAME MATCHES "Linux")) + elseif(ANDROID OR (UNIX AND NOT APPLE)) if(ANDROID) set(_targetArchOS "Android") else() @@ -78,7 +78,7 @@ function(igc_arch_detect targetArchVarName hostArchVar set(_hostArchitecture "Windows32") endif() # Use 'uname -m' to detect kernel architecture. - elseif(CMAKE_HOST_SYSTEM_NAME MATCHES "Linux") + elseif(UNIX AND NOT APPLE) set(_hostArchOS "Linux") set(_osArchitecture "x86_64") execute_process( --- IGC/CMakeLists.txt.orig 2021-03-28 09:45:11 UTC +++ IGC/CMakeLists.txt @@ -429,7 +429,7 @@ endif() # NOTE: LLVM_ON_UNIX is also true for Android (CMAKE_SYSTEM_NAME specified by Android toolchain file is also "Linux", # but we should make sure so there is no errors in our assumptions). -if((CMAKE_SYSTEM_NAME MATCHES "Linux") OR ANDROID) +if((UNIX AND NOT APPLE) OR ANDROID) set(LLVM_ON_UNIX ON) else() set(LLVM_ON_UNIX OFF) --- 3d/common/iStdLib/File.h.orig 2019-11-27 01:05:20 UTC +++ 3d/common/iStdLib/File.h @@ -105,12 +105,9 @@ inline DWORD GetModuleFileName( char* pFileName, DWORD #elif defined(ISTDLIB_UMD) #if defined(_WIN32) return ::GetModuleFileNameA( NULL, pFileName, bufSize ); - #elif defined(__linux__) + #else //TODO: add Linux implementation. return 0; - #else - // TO DO: replace with non-Windows version - #error "TODO implement non-Windows equivalent of GetModuleFileName" #endif #else // this compilation path is not intended --- 3d/common/iStdLib/Object.h.orig 2019-11-27 01:05:20 UTC +++ 3d/common/iStdLib/Object.h @@ -150,7 +150,7 @@ inline long CObject::Acquire( void ) ASSERT( m_RefCount >= 0 ); ASSERT( m_RefCount < LONG_MAX ); -#if defined(ISTDLIB_MT) && defined(__linux__) +#if defined(ISTDLIB_MT) && defined(__GNUC__) __sync_fetch_and_add(&m_RefCount, 1); #elif defined(ISTDLIB_MT) ::InterlockedIncrement(&m_RefCount); @@ -182,7 +182,7 @@ inline long CObject::Release( void ) { ASSERT( m_RefCount > 0 ); -#if defined(ISTDLIB_MT) && defined(__linux__) +#if defined(ISTDLIB_MT) && defined(__GNUC__) __sync_sub_and_fetch(&m_RefCount, 1); #elif defined(ISTDLIB_MT) ::InterlockedDecrement(&m_RefCount); --- 3d/common/iStdLib/utility.h.orig 2019-11-27 01:05:20 UTC +++ 3d/common/iStdLib/utility.h @@ -431,7 +431,7 @@ __forceinline DWORD bsr64( const unsigned long long in _BitScanReverse64( &index, static_cast<_int64>( mask ) ); return static_cast( index ); -#elif defined __linux__ +#elif defined __GNUC__ return static_cast( 63 - __builtin_clzll( mask ) ); #else @@ -464,7 +464,7 @@ __forceinline DWORD bsr( const DWORD mask ) _BitScanReverse( &index, mask ); return static_cast(index); -#elif defined __linux__ +#elif defined __GNUC__ return static_cast( 31 - __builtin_clz( mask ) ); #else @@ -497,7 +497,7 @@ __forceinline DWORD bsf64( const unsigned long long in _BitScanForward64( &index, static_cast<_int64>( mask ) ); return static_cast( index ); -#elif defined __linux__ +#elif defined __GNUC__ return static_cast( __builtin_ffsll( mask ) - 1 ); #else @@ -529,7 +529,7 @@ __forceinline DWORD bsf( const DWORD mask ) _BitScanForward( &index, mask ); return index; -#elif defined __linux__ +#elif defined __GNUC__ return static_cast( __builtin_ffsl( mask ) - 1 ); #else --- IGC/AdaptorCommon/customApi.cpp.orig 2019-11-27 01:05:20 UTC +++ IGC/AdaptorCommon/customApi.cpp @@ -457,7 +457,7 @@ namespace IGC return ""; IGCBaseFolder = "/sdcard/intel/igc/"; -#elif defined __linux__ +#elif !defined __APPLE__ if (!IGC_IS_FLAG_ENABLED(DumpToCustomDir)) { IGCBaseFolder = "/tmp/IntelIGC/"; @@ -560,7 +560,7 @@ namespace IGC g_shaderOutputFolder = ""; -#elif defined __linux__ +#elif !defined __APPLE__ if (!IGC_IS_FLAG_ENABLED(DumpToCurrentDir) && g_shaderOutputFolder == "" && !IGC_IS_FLAG_ENABLED(DumpToCustomDir)) { bool needMkdir = false; --- IGC/AdaptorOCL/CLElfLib/CLElfTypes.h.orig 2020-05-19 05:44:04 UTC +++ IGC/AdaptorOCL/CLElfLib/CLElfTypes.h @@ -30,7 +30,7 @@ Abstract: Defines the types used for ELF headers/sect \******************************************************************************/ #pragma once -#if defined(__linux__) && defined(OGL) +#if !defined(__APPLE__) && !defined(_WIN32) && defined(OGL) #include "os_inc.h" #endif --- IGC/GenISAIntrinsics/GenIntrinsics.h.orig 2020-02-10 06:06:31 UTC +++ IGC/GenISAIntrinsics/GenIntrinsics.h @@ -67,7 +67,7 @@ namespace GenISAIntrinsic { /// Thus the type array should two elements: /// Type Ts[2]{int2, int2}: to resolve to the first instance. /// Type Ts[2]{int4, int4}: to resolve to the second. -#if defined(ANDROID) || defined(__linux__) +#if defined(__GNUC__) __attribute__ ((visibility ("default"))) Function *getDeclaration(Module *M, ID id, ArrayRef OverloadedTys = None); #else Function *getDeclaration(Module *M, ID id, ArrayRef OverloadedTys = None); --- IGC/OCLFE/igd_fcl_mcl/source/clang_tb.cpp.orig 2019-11-27 01:05:20 UTC +++ IGC/OCLFE/igd_fcl_mcl/source/clang_tb.cpp @@ -65,9 +65,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #if defined(_WIN32 )|| defined( _WIN64 ) #include #include -#endif - -#if defined __linux__ +#elif !defined(__APPLE__) #include "iStdLib/File.h" #endif @@ -311,7 +309,7 @@ namespace FCL IGCBaseFolder = pathBuf; } -#elif defined __linux__ +#elif !defined(__APPLE__) if (!FCL_IGC_IS_FLAG_ENABLED(DumpToCustomDir)) { IGCBaseFolder = "/tmp/IntelIGC/"; @@ -387,7 +385,7 @@ namespace FCL iSTD::CreateAppOutputDir(pathBuf, 256, GetBaseIGCOutputFolder(), false, true, !FCL_IGC_IS_FLAG_ENABLED(ShaderDumpPidDisable)); g_shaderOutputFolder = pathBuf; } -#elif defined __linux__ +#elif !defined(__APPLE__) if (!FCL_IGC_IS_FLAG_ENABLED(DumpToCurrentDir) && g_shaderOutputFolder == "" && !FCL_IGC_IS_FLAG_ENABLED(DumpToCustomDir)) { bool needMkdir = true; ---- IGC/VectorCompiler/lib/GenXCodeGen/SPIRVWrapper.cpp.orig 2021-03-08 06:23:56 UTC -+++ IGC/VectorCompiler/lib/GenXCodeGen/SPIRVWrapper.cpp -@@ -48,7 +48,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +--- IGC/VectorCompiler/lib/Driver/SPIRVWrapper.cpp.orig 2021-04-20 09:14:00 UTC ++++ IGC/VectorCompiler/lib/Driver/SPIRVWrapper.cpp +@@ -47,7 +47,7 @@ IN THE SOFTWARE. #include "llvm/Support/DynamicLibrary.h" #include "llvm/Support/Path.h" #include "llvm/Support/Process.h" -#if defined(__linux__) +#if !defined(_WIN32) #include #endif // __linux__ #if defined(_WIN32) -@@ -172,7 +172,7 @@ Expected getSpirvReadVerifyFunc +@@ -171,7 +171,7 @@ Expected getSpirvReadVerifyFunc constexpr char *SpirvReadVerifyName = "spirv_read_verify_module"; const std::string SpirvLibPath = findSpirvDLL(); -#if defined(__linux__) +#if defined(RTLD_DEEPBIND) // Hack to workaround cmoc crashes during loading of SPIRV library static auto DeepBindHack = dlopen(SpirvLibPath.c_str(), RTLD_NOW | RTLD_DEEPBIND); ---- IGC/common/LLVMWarningsPop.hpp.orig 2019-11-27 01:05:20 UTC +--- IGC/common/LLVMWarningsPop.hpp.orig 2021-05-12 10:04:39 UTC +++ IGC/common/LLVMWarningsPop.hpp -@@ -58,6 +58,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +@@ -41,6 +41,6 @@ SPDX-License-Identifier: MIT # pragma warning( pop ) #endif -#if defined(__linux__) +#if defined(__GNUC__) # pragma GCC diagnostic pop #endif --- IGC/common/LLVMWarningsPush.hpp.orig 2020-09-16 10:27:28 UTC +++ IGC/common/LLVMWarningsPush.hpp @@ -55,7 +55,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # pragma warning( push ) #endif -#if defined(__linux__) +#if defined(__GNUC__) # pragma GCC diagnostic push # if __GNUC__ > 8 # pragma GCC diagnostic ignored "-Winit-list-lifetime" --- IGC/common/Stats.cpp.orig 2021-03-22 09:55:24 UTC +++ IGC/common/Stats.cpp @@ -1061,7 +1061,7 @@ void TimeStats::printTimeCSV( std::string const& corpu else subFile += IGC::Debug::GetShaderCorpusName(); const std::string outputFilePath = -#if defined(__linux__) +#if !defined(_WIN32) subFile + ".csv"; #else std::string("c:\\Intel\\") + subFile + ".csv"; ---- IGC/common/igc_regkeys.hpp.orig 2019-11-27 01:05:20 UTC +--- IGC/common/igc_regkeys.hpp.orig 2021-07-18 10:00:28 UTC +++ IGC/common/igc_regkeys.hpp -@@ -39,7 +39,7 @@ typedef char debugString[256]; +@@ -22,7 +22,7 @@ typedef char debugString[256]; #define IGC_DEBUG_VARIABLES #endif --#if defined( __linux__ ) -+#if !defined( __APPLE__ ) && !defined( _WIN32 ) +-#if defined(__linux__) ++#if !defined(__APPLE__) && !defined(_WIN32) #define IGC_DEBUG_VARIABLES #endif -@@ -67,7 +67,7 @@ struct SRegKeyVariableMetaData +@@ -52,7 +52,7 @@ struct SRegKeyVariableMetaData } }; --#if defined ( __linux__ ) && !defined( _DEBUG ) && !defined( _INTERNAL ) -+#if !defined ( _WIN32 ) && !defined( _DEBUG ) && !defined( _INTERNAL ) +-#if defined (__linux__) && !defined(_DEBUG) && !defined(_INTERNAL) ++#if !defined(_WIN32) && !defined(_DEBUG) && !defined(_INTERNAL) #define LINUX_RELEASE_MODE #endif --- visa/BuildCISAIRImpl.cpp.orig 2020-09-16 10:27:28 UTC +++ visa/BuildCISAIRImpl.cpp @@ -576,7 +576,6 @@ extern void CISA_delete_buffer(YY_BUFFER_STATE buf); int CISA_IR_Builder::ParseVISAText(const std::string& visaHeader, const std::string& visaText, const std::string& visaTextFile) { -#if defined(__linux__) || defined(_WIN64) || defined(_WIN32) // Direct output of parser to null #if defined(_WIN64) || defined(_WIN32) CISAout = fopen("nul", "w"); @@ -627,16 +626,11 @@ int CISA_IR_Builder::ParseVISAText(const std::string& } return status; -#else - assert(0 && "vISA asm parsing not supported on this platform"); - return VISA_FAILURE; -#endif } // Parses inline asm file from ShaderOverride int CISA_IR_Builder::ParseVISAText(const std::string& visaFile) { -#if defined(__linux__) || defined(_WIN64) || defined(_WIN32) // Direct output of parser to null #if defined(_WIN64) || defined(_WIN32) CISAout = fopen("nul", "w"); @@ -662,10 +656,6 @@ int CISA_IR_Builder::ParseVISAText(const std::string& fclose(CISAout); } return VISA_SUCCESS; -#else - assert(0 && "Asm parsing not supported on this platform"); - return VISA_FAILURE; -#endif } // default size of the kernel mem manager in bytes diff --git a/devel/intel-graphics-compiler/pkg-plist b/devel/intel-graphics-compiler/pkg-plist index 7f2a6935c234..968e8aebed31 100644 --- a/devel/intel-graphics-compiler/pkg-plist +++ b/devel/intel-graphics-compiler/pkg-plist @@ -1,102 +1,103 @@ bin/GenX_IR bin/iga%%ARCH_SUFX%% include/iga/iga.h include/iga/iga.hpp include/iga/igaEncoderWrapper.hpp include/iga/iga_bxml_enums.hpp include/iga/iga_bxml_ops.hpp include/iga/iga_types_ext.hpp include/iga/iga_types_swsb.hpp include/iga/igad.h include/iga/igax.hpp include/iga/kv.h include/iga/kv.hpp include/igc/cif/CMakeLists.txt include/igc/cif/cif/CMakeLists.txt include/igc/cif/cif/builtins/builtins_registry.cpp include/igc/cif/cif/builtins/builtins_registry.h include/igc/cif/cif/builtins/memory/buffer/buffer.h include/igc/cif/cif/builtins/memory/buffer/impl/buffer_impl.cpp include/igc/cif/cif/builtins/memory/buffer/impl/buffer_impl.h include/igc/cif/cif/common/cif.h include/igc/cif/cif/common/cif_main.h include/igc/cif/cif/common/coder.h include/igc/cif/cif/common/compatibility.h include/igc/cif/cif/common/id.h include/igc/cif/cif/common/library_api.h include/igc/cif/cif/common/library_handle.h include/igc/cif/cif/export/build/binary_version.h include/igc/cif/cif/export/cif_impl.h include/igc/cif/cif/export/cif_main.cpp include/igc/cif/cif/export/cif_main_impl.h include/igc/cif/cif/export/interface_creator.h include/igc/cif/cif/export/library_api.h include/igc/cif/cif/export/muiltiversion.h include/igc/cif/cif/export/pimpl_base.h include/igc/cif/cif/export/registry.cpp include/igc/cif/cif/export/registry.h include/igc/cif/cif/helpers/error.h include/igc/cif/cif/helpers/memory.h include/igc/cif/cif/import/cif_main.cpp include/igc/cif/cif/import/cif_main.h include/igc/cif/cif/import/library_api.h include/igc/cif/cif/macros/disable.h include/igc/cif/cif/macros/enable.h include/igc/cif/cif/os/lin/lin_library_handle.cpp include/igc/cif/cif/os/lin/lin_library_handle.h include/igc/cif/cif/os/win/win_library_handle.cpp include/igc/cif/cif/os/win/win_library_handle.h include/igc/cif/readme.txt +include/igc/common/StateSaveAreaHeader.h include/igc/igc.opencl.h include/igc/ocl_igc_interface/code_type.h include/igc/ocl_igc_interface/fcl_ocl_device_ctx.h include/igc/ocl_igc_interface/fcl_ocl_translation_ctx.h include/igc/ocl_igc_interface/gt_system_info.h include/igc/ocl_igc_interface/igc_features_and_workarounds.h include/igc/ocl_igc_interface/igc_ocl_device_ctx.h include/igc/ocl_igc_interface/igc_ocl_translation_ctx.h include/igc/ocl_igc_interface/impl/fcl_ocl_device_ctx_impl.cpp include/igc/ocl_igc_interface/impl/fcl_ocl_device_ctx_impl.h include/igc/ocl_igc_interface/impl/fcl_ocl_translation_ctx_impl.cpp include/igc/ocl_igc_interface/impl/fcl_ocl_translation_ctx_impl.h include/igc/ocl_igc_interface/impl/gt_system_info_impl.cpp include/igc/ocl_igc_interface/impl/gt_system_info_impl.h include/igc/ocl_igc_interface/impl/igc_features_and_workarounds_impl.cpp include/igc/ocl_igc_interface/impl/igc_features_and_workarounds_impl.h include/igc/ocl_igc_interface/impl/igc_ocl_device_ctx_impl.cpp include/igc/ocl_igc_interface/impl/igc_ocl_device_ctx_impl.h include/igc/ocl_igc_interface/impl/igc_ocl_translation_ctx_impl.cpp include/igc/ocl_igc_interface/impl/igc_ocl_translation_ctx_impl.h include/igc/ocl_igc_interface/impl/ocl_gen_binary_impl.cpp include/igc/ocl_igc_interface/impl/ocl_gen_binary_impl.h include/igc/ocl_igc_interface/impl/ocl_translation_output_impl.cpp include/igc/ocl_igc_interface/impl/ocl_translation_output_impl.h include/igc/ocl_igc_interface/impl/platform_impl.cpp include/igc/ocl_igc_interface/impl/platform_impl.h include/igc/ocl_igc_interface/ocl_gen_binary.h include/igc/ocl_igc_interface/ocl_translation_output.h include/igc/ocl_igc_interface/platform.h include/igc/ocl_igc_interface/platform_helper.h include/igc/ocl_igc_shared/device_enqueue/DeviceEnqueueInternalTypes.h include/igc/ocl_igc_shared/executable_format/patch_g10.h include/igc/ocl_igc_shared/executable_format/patch_g7.h include/igc/ocl_igc_shared/executable_format/patch_g8.h include/igc/ocl_igc_shared/executable_format/patch_g9.h include/igc/ocl_igc_shared/executable_format/patch_list.h include/igc/ocl_igc_shared/executable_format/patch_shared.h include/igc/ocl_igc_shared/executable_format/program_debug_data.h include/igc/ocl_igc_shared/gtpin/gtpin_driver_common.h include/igc/ocl_igc_shared/gtpin/gtpin_driver_common_bti.h include/igc/ocl_igc_shared/gtpin/gtpin_ocl_interface.h include/visa/RelocationInfo.h @comment lib/igc/NOTICES.txt lib/libiga%%ARCH_SUFX%%.so lib/libiga%%ARCH_SUFX%%.so.1 lib/libiga%%ARCH_SUFX%%.so.1.0.1 lib/libigc.so lib/libigc.so.1 lib/libigc.so.1.0.1 lib/libigdfcl.so lib/libigdfcl.so.1 lib/libigdfcl.so.1.0.1 libdata/pkgconfig/igc-opencl.pc