diff --git a/abi_symbols b/abi_symbols --- a/abi_symbols +++ b/abi_symbols @@ -172,15 +172,22 @@ libocloc.so:_ZN14OclocArgHelper14findSourceFileERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE libocloc.so:_ZN14OclocArgHelper14readBinaryFileERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE libocloc.so:_ZN14OclocArgHelper16loadDataFromFileERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERm +libocloc.so:_ZN14OclocArgHelper16returnIGFXforGenERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE libocloc.so:_ZN14OclocArgHelper24headersToVectorOfStringsB5cxx11Ev libocloc.so:_ZN14OclocArgHelper25readFileToVectorOfStringsERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERSt6vectorIS5_SaIS5_EE +libocloc.so:_ZN14OclocArgHelper26returnProductNameForDeviceB5cxx11Et +libocloc.so:_ZN14OclocArgHelper5isGenERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE libocloc.so:_ZN14OclocArgHelperC1EjPPKhPKmPPKcjS2_S4_S7_PjPPPhPPmPPPc +libocloc.so:_ZN14OclocArgHelperC1Ev libocloc.so:_ZN14OclocArgHelperC2EjPPKhPKmPPKcjS2_S4_S7_PjPPPhPPmPPPc +libocloc.so:_ZN14OclocArgHelperC2Ev libocloc.so:_ZN14OclocArgHelperD0Ev libocloc.so:_ZN14OclocArgHelperD1Ev libocloc.so:_ZN14OclocArgHelperD2Ev +libocloc.so:_ZN2Os10gdiDllNameE libocloc.so:_ZN2Os10igcDllNameE libocloc.so:_ZN2Os12libvaDllNameE +libocloc.so:_ZN2Os13dxcoreDllNameE libocloc.so:_ZN2Os15frontEndDllNameE libocloc.so:_ZN2Os18sysFsPciPathPrefixE libocloc.so:_ZN2Os19pciDevicesDirectoryE @@ -202,6 +209,7 @@ libocloc.so:_ZN3NEO11ProgramInfoD1Ev libocloc.so:_ZN3NEO11ProgramInfoD2Ev libocloc.so:_ZN3NEO11asProductIdENS_14ConstStringRefERKSt6vectorI14PRODUCT_FAMILYSaIS2_EE +libocloc.so:_ZN3NEO11getRevisionB5cxx11Ev libocloc.so:_ZN3NEO12DebugManagerE libocloc.so:_ZN3NEO12HardwareInfoC1EPK12PLATFORM_STRPKNS_12FeatureTableEPKNS_15WorkaroundTableEPK14GT_SYSTEM_INFORKNS_22RuntimeCapabilityTableE libocloc.so:_ZN3NEO12HardwareInfoC2EPK12PLATFORM_STRPKNS_12FeatureTableEPKNS_15WorkaroundTableEPK14GT_SYSTEM_INFORKNS_22RuntimeCapabilityTableE @@ -244,6 +252,7 @@ libocloc.so:_ZN3NEO15OfflineCompiler10printUsageEv libocloc.so:_ZN3NEO15OfflineCompiler11getBuildLogB5cxx11Ev libocloc.so:_ZN3NEO15OfflineCompiler11storeBinaryERPcRmPKvm +libocloc.so:_ZN3NEO15OfflineCompiler12performQueryEv libocloc.so:_ZN3NEO15OfflineCompiler13buildIrBinaryEv libocloc.so:_ZN3NEO15OfflineCompiler14updateBuildLogEPKcm libocloc.so:_ZN3NEO15OfflineCompiler15buildSourceCodeEv @@ -260,14 +269,15 @@ libocloc.so:_ZN3NEO15OfflineCompiler25getStringWithinDelimitersERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE libocloc.so:_ZN3NEO15OfflineCompiler39setStatelessToStatefullBufferOffsetFlagEv libocloc.so:_ZN3NEO15OfflineCompiler5buildEv +libocloc.so:_ZN3NEO15OfflineCompiler5queryEmRKSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS7_EEP14OclocArgHelper libocloc.so:_ZN3NEO15OfflineCompiler6createEmRKSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS7_EEbRiP14OclocArgHelper libocloc.so:_ZN3NEO15OfflineCompilerC1Ev libocloc.so:_ZN3NEO15OfflineCompilerC2Ev libocloc.so:_ZN3NEO15OfflineCompilerD1Ev libocloc.so:_ZN3NEO15OfflineCompilerD2Ev -libocloc.so:_ZN3NEO15asGfxCoreIdListENS_14ConstStringRefE libocloc.so:_ZN3NEO15clStdOptionNameB5cxx11E libocloc.so:_ZN3NEO15getDevicesTypesB5cxx11Ev +libocloc.so:_ZN3NEO15getIntelGTNotesERKNS_3Elf3ElfILNS0_20ELF_IDENTIFIER_CLASSE2EEE libocloc.so:_ZN3NEO15getMajorVersionERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE libocloc.so:_ZN3NEO15isSimulationBDWEt libocloc.so:_ZN3NEO15isSimulationBXTEt @@ -294,17 +304,19 @@ libocloc.so:_ZN3NEO18abortUnrecoverableEiPKc libocloc.so:_ZN3NEO18getDevicesFamiliesB5cxx11Ev libocloc.so:_ZN3NEO18initialHardwareTagE -libocloc.so:_ZN3NEO18requestedFatBinaryERKSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS6_EE +libocloc.so:_ZN3NEO18requestedFatBinaryERKSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS6_EEP14OclocArgHelper libocloc.so:_ZN3NEO19convertToPascalCaseERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE libocloc.so:_ZN3NEO19getChosenEngineTypeERKNS_12HardwareInfoE +libocloc.so:_ZN3NEO19getOclDriverVersionB5cxx11Ev libocloc.so:_ZN3NEO20createMainNoSanitizeEPFPN3CIF7CIFMainEvE libocloc.so:_ZN3NEO20deviceExtensionsListE libocloc.so:_ZN3NEO20extractZebinSectionsERNS_3Elf3ElfILNS0_20ELF_IDENTIFIER_CLASSE2EEERNS_13ZebinSectionsERNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESD_ libocloc.so:_ZN3NEO20isDeviceBinaryFormatILNS_18DeviceBinaryFormatE6EEEb8ArrayRefIKhE libocloc.so:_ZN3NEO20overridePlatformNameERNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE +libocloc.so:_ZN3NEO20validateTargetDeviceERKNS_3Elf3ElfILNS0_20ELF_IDENTIFIER_CLASSE2EEERKNS_12TargetDeviceE libocloc.so:_ZN3NEO21getFamilyNameWithTypeB5cxx11ERKNS_12HardwareInfoE libocloc.so:_ZN3NEO21populateArgDescriptorERKNS_3Elf19ZebinKernelMetadata5Types6Kernel15PayloadArgument20PayloadArgumentBaseTERNS_16KernelDescriptorERjRNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESH_ -libocloc.so:_ZN3NEO21populateArgDescriptorERKNS_3Elf19ZebinKernelMetadata5Types6Kernel24PerThreadPayloadArgument29PerThreadPayloadArgumentBaseTERNS_16KernelDescriptorERNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESG_ +libocloc.so:_ZN3NEO21populateArgDescriptorERKNS_3Elf19ZebinKernelMetadata5Types6Kernel24PerThreadPayloadArgument29PerThreadPayloadArgumentBaseTERNS_16KernelDescriptorEjRNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESG_ libocloc.so:_ZN3NEO21populateZeInfoVersionERNS_3Elf19ZebinKernelMetadata5Types7VersionERNS_4Yaml10YamlParserERKNS5_4NodeERNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESH_ libocloc.so:_ZN3NEO22getOpenclCFeaturesListERKNS_12HardwareInfoER8StackVecI16_cl_name_versionLm15EhE libocloc.so:_ZN3NEO23parseHwInfoConfigStringERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERm @@ -326,7 +338,7 @@ libocloc.so:_ZN3NEO25setHwInfoValuesFromConfigEmRNS_12HardwareInfoE libocloc.so:_ZN3NEO25setupADLSHardwareInfoImplEPNS_12HardwareInfoEbm libocloc.so:_ZN3NEO26getHwInfoForPlatformStringERNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERPKNS_12HardwareInfoE -libocloc.so:_ZN3NEO26readZeInfoPayloadArgumentsERKNS_4Yaml10YamlParserERKNS0_4NodeER8StackVecINS_3Elf19ZebinKernelMetadata5Types6Kernel15PayloadArgument20PayloadArgumentBaseTELm32EhERjNS_14ConstStringRefERNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESO_ +libocloc.so:_ZN3NEO26readZeInfoPayloadArgumentsERKNS_4Yaml10YamlParserERKNS0_4NodeER8StackVecINS_3Elf19ZebinKernelMetadata5Types6Kernel15PayloadArgument20PayloadArgumentBaseTELm32EhERjRiNS_14ConstStringRefERNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESP_ libocloc.so:_ZN3NEO26setupICLLPHardwareInfoImplEPNS_12HardwareInfoEbm libocloc.so:_ZN3NEO26setupTGLLPHardwareInfoImplEPNS_12HardwareInfoEbm libocloc.so:_ZN3NEO26validateZebinSectionsCountERKNS_13ZebinSectionsERNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES9_ @@ -442,8 +454,8 @@ libocloc.so:_ZN3NEO5Linux18adjustLibraryFlagsERi libocloc.so:_ZN3NEO5Linux9OsLibrary14getProcAddressERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE libocloc.so:_ZN3NEO5Linux9OsLibrary8isLoadedEv -libocloc.so:_ZN3NEO5Linux9OsLibraryC1ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE -libocloc.so:_ZN3NEO5Linux9OsLibraryC2ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE +libocloc.so:_ZN3NEO5Linux9OsLibraryC1ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEPS7_ +libocloc.so:_ZN3NEO5Linux9OsLibraryC2ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEPS7_ libocloc.so:_ZN3NEO5Linux9OsLibraryD0Ev libocloc.so:_ZN3NEO5Linux9OsLibraryD1Ev libocloc.so:_ZN3NEO5Linux9OsLibraryD2Ev @@ -468,12 +480,18 @@ libocloc.so:_ZN3NEO8HwMapperIL14PRODUCT_FAMILY29EE12abbreviationE libocloc.so:_ZN3NEO8HwMapperIL14PRODUCT_FAMILY30EE12abbreviationE libocloc.so:_ZN3NEO8HwMapperIL14PRODUCT_FAMILY31EE12abbreviationE +libocloc.so:_ZN3NEO8SysCalls12getProcessIdEv libocloc.so:_ZN3NEO8SysCalls13getDevicePathEiPcRm +libocloc.so:_ZN3NEO8SysCalls4mmapEPvmiiil libocloc.so:_ZN3NEO8SysCalls4openEPKci +libocloc.so:_ZN3NEO8SysCalls4pollEP6pollfdmi libocloc.so:_ZN3NEO8SysCalls5closeEi +libocloc.so:_ZN3NEO8SysCalls5fstatEiP4stat libocloc.so:_ZN3NEO8SysCalls5ioctlEimPv +libocloc.so:_ZN3NEO8SysCalls5preadEiPvml libocloc.so:_ZN3NEO8SysCalls6accessEPKci libocloc.so:_ZN3NEO8SysCalls6dlopenEPKci +libocloc.so:_ZN3NEO8SysCalls6munmapEPvm libocloc.so:_ZN3NEO8SysCalls8readlinkEPKcPcm libocloc.so:_ZN3NEO9BDW_1x2x612gtSystemInfoE libocloc.so:_ZN3NEO9BDW_1x2x617setupHardwareInfoEPNS_12HardwareInfoEb @@ -534,6 +552,7 @@ libocloc.so:_ZN3NEO9LKF_1x8x86hwInfoE libocloc.so:_ZN3NEO9OsLibrary20createFullSystemPathERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE libocloc.so:_ZN3NEO9OsLibrary4loadERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE +libocloc.so:_ZN3NEO9OsLibrary4loadERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEPS6_ libocloc.so:_ZN3NEO9SKL_1x2x612gtSystemInfoE libocloc.so:_ZN3NEO9SKL_1x2x617setupHardwareInfoEPNS_12HardwareInfoEb libocloc.so:_ZN3NEO9SKL_1x2x66hwInfoE @@ -556,6 +575,7 @@ libocloc.so:_ZNK10IgaWrapper15isKnownPlatformEv libocloc.so:_ZNK14OclocArgHelper10fileExistsERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE libocloc.so:_ZNK14OclocArgHelper16sourceFileExistsERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE +libocloc.so:_ZNK3NEO16KernelDescriptor10hasRTCallsEv libocloc.so:_ZNK3NEO2Ar9ArEncoder6encodeEv libocloc.so:_ZNK3NEO4Yaml10YamlParser15buildDebugNodesERKNS0_4NodeE libocloc.so:_ZNK3NEO4Yaml10YamlParser15buildDebugNodesEv @@ -625,6 +645,7 @@ libze_intel_gpu.so.1:zeCommandQueueSynchronize libze_intel_gpu.so.1:zeCommandQueueSynchronize_Tracing libze_intel_gpu.so.1:zeContextCreate +libze_intel_gpu.so.1:zeContextCreateEx libze_intel_gpu.so.1:zeContextCreate_Tracing libze_intel_gpu.so.1:zeContextDestroy libze_intel_gpu.so.1:zeContextDestroy_Tracing @@ -651,6 +672,7 @@ libze_intel_gpu.so.1:zeDeviceGetComputeProperties_Tracing libze_intel_gpu.so.1:zeDeviceGetExternalMemoryProperties libze_intel_gpu.so.1:zeDeviceGetExternalMemoryProperties_Tracing +libze_intel_gpu.so.1:zeDeviceGetGlobalTimestamps libze_intel_gpu.so.1:zeDeviceGetImageProperties libze_intel_gpu.so.1:zeDeviceGetImageProperties_Tracing libze_intel_gpu.so.1:zeDeviceGetMemoryAccessProperties @@ -668,9 +690,12 @@ libze_intel_gpu.so.1:zeDeviceGetSubDevices libze_intel_gpu.so.1:zeDeviceGetSubDevices_Tracing libze_intel_gpu.so.1:zeDeviceGet_Tracing +libze_intel_gpu.so.1:zeDeviceReserveCacheExt +libze_intel_gpu.so.1:zeDeviceSetCacheAdviceExt libze_intel_gpu.so.1:zeDriverGet libze_intel_gpu.so.1:zeDriverGetApiVersion libze_intel_gpu.so.1:zeDriverGetApiVersion_Tracing +libze_intel_gpu.so.1:zeDriverGetExtensionFunctionAddress libze_intel_gpu.so.1:zeDriverGetExtensionProperties libze_intel_gpu.so.1:zeDriverGetExtensionProperties_Tracing libze_intel_gpu.so.1:zeDriverGetIpcProperties @@ -721,7 +746,9 @@ libze_intel_gpu.so.1:zeGetEventProcAddrTable libze_intel_gpu.so.1:zeGetFenceProcAddrTable libze_intel_gpu.so.1:zeGetGlobalProcAddrTable +libze_intel_gpu.so.1:zeGetImageExpProcAddrTable libze_intel_gpu.so.1:zeGetImageProcAddrTable +libze_intel_gpu.so.1:zeGetKernelExpProcAddrTable libze_intel_gpu.so.1:zeGetKernelProcAddrTable libze_intel_gpu.so.1:zeGetMemProcAddrTable libze_intel_gpu.so.1:zeGetModuleBuildLogProcAddrTable @@ -733,8 +760,10 @@ libze_intel_gpu.so.1:zeImageCreate_Tracing libze_intel_gpu.so.1:zeImageDestroy libze_intel_gpu.so.1:zeImageDestroy_Tracing +libze_intel_gpu.so.1:zeImageGetMemoryPropertiesExp libze_intel_gpu.so.1:zeImageGetProperties libze_intel_gpu.so.1:zeImageGetProperties_Tracing +libze_intel_gpu.so.1:zeImageViewCreateExp libze_intel_gpu.so.1:zeInit libze_intel_gpu.so.1:zeInit_Tracing libze_intel_gpu.so.1:zeKernelCreate @@ -850,6 +879,7 @@ libze_intel_gpu.so.1:zesDiagnosticsGetTests libze_intel_gpu.so.1:zesDiagnosticsRunTests libze_intel_gpu.so.1:zesDriverEventListen +libze_intel_gpu.so.1:zesDriverEventListenEx libze_intel_gpu.so.1:zesEngineGetActivity libze_intel_gpu.so.1:zesEngineGetProperties libze_intel_gpu.so.1:zesFabricPortGetConfig diff --git a/abi_used_libs b/abi_used_libs --- a/abi_used_libs +++ b/abi_used_libs @@ -1,4 +1,3 @@ -UNKNOWN ld-linux-x86-64.so.2 libc.so.6 libdl.so.2 diff --git a/abi_used_symbols b/abi_used_symbols --- a/abi_used_symbols +++ b/abi_used_symbols @@ -1,5 +1,3 @@ -UNKNOWN:GmmAdapterDestroy -UNKNOWN:InitializeGmm ld-linux-x86-64.so.2:__tls_get_addr libc.so.6:__cxa_atexit libc.so.6:__fprintf_chk @@ -40,6 +38,7 @@ libc.so.6:inet_addr libc.so.6:ioctl libc.so.6:isalpha +libc.so.6:isxdigit libc.so.6:kill libc.so.6:memcmp libc.so.6:memcpy @@ -51,12 +50,15 @@ libc.so.6:munmap libc.so.6:nanosleep libc.so.6:opendir +libc.so.6:poll libc.so.6:pthread_self libc.so.6:putchar libc.so.6:puts libc.so.6:readdir libc.so.6:readlink libc.so.6:remove +libc.so.6:rewind +libc.so.6:sched_yield libc.so.6:shutdown libc.so.6:snprintf libc.so.6:socket @@ -78,11 +80,16 @@ libc.so.6:tolower libc.so.6:toupper libc.so.6:vfprintf +libc.so.6:wcslen +libc.so.6:wmemcpy libdl.so.2:dlclose +libdl.so.2:dlerror libdl.so.2:dlopen libdl.so.2:dlsym libgcc_s.so.1:_Unwind_Resume libgcc_s.so.1:__popcountdi2 +libigdgmm.so.11:GmmAdapterDestroy +libigdgmm.so.11:InitializeGmm libm.so.6:log libm.so.6:pow libm.so.6:round @@ -91,6 +98,7 @@ libpthread.so.0:connect libpthread.so.0:lseek libpthread.so.0:open +libpthread.so.0:pread libpthread.so.0:pthread_create libpthread.so.0:pthread_join libpthread.so.0:read @@ -174,6 +182,8 @@ libstdc++.so.6:_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE9_M_createERmm libstdc++.so.6:_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE9_M_mutateEmmPKcm libstdc++.so.6:_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEED1Ev +libstdc++.so.6:_ZNSt7__cxx1112basic_stringIwSt11char_traitsIwESaIwEE10_M_disposeEv +libstdc++.so.6:_ZNSt7__cxx1112basic_stringIwSt11char_traitsIwESaIwEE9_M_createERmm libstdc++.so.6:_ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEE14__xfer_bufptrsD1Ev libstdc++.so.6:_ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEE7_M_syncEPcmm libstdc++.so.6:_ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEE8_M_pbumpEPcS5_l diff --git a/files/ab52c702337358af57140e760d618549372e1cdd.patch b/files/ab52c702337358af57140e760d618549372e1cdd.patch new file mode 100644 --- /dev/null +++ b/files/ab52c702337358af57140e760d618549372e1cdd.patch @@ -0,0 +1,116 @@ +From ab52c702337358af57140e760d618549372e1cdd Mon Sep 17 00:00:00 2001 +From: Szymon Morek +Date: Thu, 20 May 2021 10:07:53 +0000 +Subject: [PATCH] Change builtin kernels compilation process + +.bin and .gen files for builtin kernels are generated per revision now + +Resolves: NEO-5821 + +Signed-off-by: Szymon Morek +--- + .../offline_compiler_tests.cpp | 23 ++++++++++++++++ + .../source/offline_compiler.cpp | 2 +- + .../source/built_ins/kernels/CMakeLists.txt | 26 ++++++++++++------- + 3 files changed, 41 insertions(+), 10 deletions(-) + +diff --git a/opencl/test/unit_test/offline_compiler/offline_compiler_tests.cpp b/opencl/test/unit_test/offline_compiler/offline_compiler_tests.cpp +index 000fe047ed..12d755d697 100644 +--- a/opencl/test/unit_test/offline_compiler/offline_compiler_tests.cpp ++++ b/opencl/test/unit_test/offline_compiler/offline_compiler_tests.cpp +@@ -1595,4 +1595,27 @@ TEST(OclocCompile, givenPackedDeviceBinaryFormatWhenGeneratingElfBinaryThenItIsR + ASSERT_EQ(true, ocloc.generateElfBinary()); + EXPECT_EQ(0, memcmp(zebin.storage.data(), ocloc.elfBinary.data(), zebin.storage.size())); + } ++ ++TEST(OclocCompile, givenSpirvInputThenDontGenerateSpirvFile) { ++ MockOfflineCompiler ocloc; ++ ++ std::vector argv = { ++ "ocloc", ++ "-q", ++ "-file", ++ "test_files/binary_with_zeroes", ++ "-out_dir", ++ "offline_compiler_test", ++ "-device", ++ gEnvironment->devicePrefix.c_str(), ++ "-spirv_input"}; ++ ++ int retVal = ocloc.initialize(argv.size(), argv); ++ ASSERT_EQ(0, retVal); ++ retVal = ocloc.build(); ++ EXPECT_EQ(0, retVal); ++ EXPECT_TRUE(compilerOutputExists("offline_compiler_test/binary_with_zeroes", "gen")); ++ EXPECT_TRUE(compilerOutputExists("offline_compiler_test/binary_with_zeroes", "bin")); ++ EXPECT_FALSE(compilerOutputExists("offline_compiler_test/binary_with_zeroes", "spv")); ++} + } // namespace NEO +diff --git a/shared/offline_compiler/source/offline_compiler.cpp b/shared/offline_compiler/source/offline_compiler.cpp +index 64829b723a..389a986453 100644 +--- a/shared/offline_compiler/source/offline_compiler.cpp ++++ b/shared/offline_compiler/source/offline_compiler.cpp +@@ -1019,7 +1019,7 @@ void OfflineCompiler::writeOutAllFiles() { + } + } + +- if (irBinary) { ++ if (irBinary && !inputFileSpirV) { + std::string irOutputFileName = generateFilePathForIr(fileBase) + generateOptsSuffix(); + + argHelper->saveOutput(irOutputFileName, irBinary, irBinarySize); +diff --git a/shared/source/built_ins/kernels/CMakeLists.txt b/shared/source/built_ins/kernels/CMakeLists.txt +index 12dc4aa7ad..59723fdb29 100644 +--- a/shared/source/built_ins/kernels/CMakeLists.txt ++++ b/shared/source/built_ins/kernels/CMakeLists.txt +@@ -58,11 +58,8 @@ function(compile_builtin gen_type platform_type builtin bits builtin_options mod + # get name of the file w/o extension + get_filename_component(BASENAME ${builtin} NAME_WE) + +- set(OUTPUTPATH_BASE "${OUTPUTDIR}/${mode}_${BASENAME}_${family_name_with_type}") +- set(OUTPUT_FILES +- ${OUTPUTPATH_BASE}.spv +- ${OUTPUTPATH_BASE}.bin +- ${OUTPUTPATH_BASE}.gen ++ set(OUTPUT_FILE_SPV ++ ${OUTPUTDIR}/${mode}_${BASENAME}_${family_name_with_type}.spv + ) + + if(NOT DEFINED cloc_cmd_prefix) +@@ -79,8 +76,8 @@ function(compile_builtin gen_type platform_type builtin bits builtin_options mod + list(APPEND __cloc__options__ "-cl-kernel-arg-info") + set(INTERNAL_OPTIONS "${${mode}_OPTIONS}") + add_custom_command( +- OUTPUT ${OUTPUT_FILES} +- COMMAND ${cloc_cmd_prefix} -q -file ${FILENAME} -device ${DEFAULT_SUPPORTED_${gen_type}_${platform_type}_PLATFORM} ${builtin_options} -${bits} -output ${mode}_${BASENAME} -out_dir ${OUTPUTDIR} ${INTERNAL_OPTIONS} -options "$" ++ OUTPUT ${OUTPUT_FILE_SPV} ++ COMMAND ${cloc_cmd_prefix} -q -file ${FILENAME} -spv_only -device ${DEFAULT_SUPPORTED_${gen_type}_${platform_type}_PLATFORM} ${builtin_options} -${bits} -output ${mode}_${BASENAME} -out_dir ${OUTPUTDIR} ${INTERNAL_OPTIONS} -options "$" + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + DEPENDS ${builtin} ocloc copy_compiler_files + ) +@@ -88,12 +85,23 @@ function(compile_builtin gen_type platform_type builtin bits builtin_options mod + set(OUTPUT_FILE_CPP + ${OUTPUTDIR}/${mode}_${BASENAME}_${family_name_with_type}_${REVISION_ID}.cpp + ) ++ set(BINARY_OUTPUT "${OUTPUTDIR}/${mode}_${BASENAME}_${REVISION_ID}_${family_name_with_type}") ++ set(OUTPUT_FILES_BINARIES ++ ${BINARY_OUTPUT}.gen ++ ${BINARY_OUTPUT}.bin ++ ) + list(APPEND BUILTINS_COMMANDS "${OUTPUT_FILE_CPP}") ++ add_custom_command( ++ OUTPUT ${OUTPUT_FILES_BINARIES} ++ COMMAND ${cloc_cmd_prefix} -q -file ${OUTPUT_FILE_SPV} -spirv_input -device ${DEFAULT_SUPPORTED_${gen_type}_${platform_type}_PLATFORM} ${builtin_options} -${bits} -output ${mode}_${BASENAME}_${REVISION_ID} -out_dir ${OUTPUTDIR} -revision_id ${REVISION_ID} ${INTERNAL_OPTIONS} -options "$" ++ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} ++ DEPENDS ${OUTPUT_FILE_SPV} ocloc copy_compiler_files ++ ) + add_custom_command( + OUTPUT ${OUTPUT_FILE_CPP} +- COMMAND $ --file ${OUTPUTPATH_BASE}.gen --output ${OUTPUT_FILE_CPP} --array ${mode}_${BASENAME} --platform ${family_name_with_type} --revision_id ${REVISION_ID} ++ COMMAND $ --file ${BINARY_OUTPUT}.gen --output ${OUTPUT_FILE_CPP} --array ${mode}_${BASENAME} --platform ${family_name_with_type} --revision_id ${REVISION_ID} + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} +- DEPENDS ${OUTPUTPATH_BASE}.gen $ ++ DEPENDS ${OUTPUT_FILES_BINARIES} $ + ) + endforeach() + set(BUILTINS_COMMANDS ${BUILTINS_COMMANDS} PARENT_SCOPE) diff --git a/package.yml b/package.yml --- a/package.yml +++ b/package.yml @@ -1,8 +1,8 @@ name : intel-compute-runtime -version : 21.11.19310 -release : 2 +version : 21.30.20482 +release : 3 source : - - https://github.com/intel/compute-runtime/archive/refs/tags/21.11.19310.tar.gz : 81ad742cb3f6990cc9b44356742f955587219f64920313e066f4b4c2a47d6def + - https://github.com/intel/compute-runtime/archive/refs/tags/21.30.20482.tar.gz : 978e8d8471e658beca650890ec0d3160a2aac958a3c865ce4b61d334c73b2fb1 license : MIT component : programming.tools homepage : https://github.com/intel/compute-runtime/ @@ -18,6 +18,9 @@ - pkgconfig(libze_loader) libsplit : no setup : | + # revert the commit that causes the LLVM 12 new pass manager to fail + %patch -p1 -R < $pkgfiles/ab52c702337358af57140e760d618549372e1cdd.patch + # disable warnings as errors sed -i 's|-Werror||g' CMakeLists.txt %cmake_ninja \ diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml --- a/pspec_x86_64.xml +++ b/pspec_x86_64.xml @@ -3,8 +3,8 @@ intel-compute-runtime https://github.com/intel/compute-runtime/ - Joshua Strobl - joshua@getsol.us + Campbell Jones + dev@serebit.com MIT programming.tools @@ -24,7 +24,7 @@ /usr/lib64/intel-opencl/libigdrcl.so /usr/lib64/libocloc.so /usr/lib64/libze_intel_gpu.so.1 - /usr/lib64/libze_intel_gpu.so.1.0.0 + /usr/lib64/libze_intel_gpu.so.1.1.0 /usr/share/OpenCL/vendors/intel.icd @@ -38,19 +38,19 @@ programming.devel - intel-compute-runtime + intel-compute-runtime /usr/include/ocloc_api.h - - 2021-06-25 - 21.11.19310 + + 2021-08-03 + 21.30.20482 Packaging update - Joshua Strobl - joshua@getsol.us + Campbell Jones + dev@serebit.com \ No newline at end of file