From 9f08a60a20d0ac4f04c4b5f9a69bc905485e1565 Mon Sep 17 00:00:00 2001 From: Krystian Chmielewski Date: Mon, 19 Oct 2020 20:36:05 +0200 Subject: [PATCH] KernelInfo Refactor Using kernelDescriptor.kernelMetadata.kernelName instead of kernelInfo.name Change-Id: I11f5721d8072a3beccb573cec4bea56cf14cf0f9 --- level_zero/core/source/kernel/kernel_imp.cpp | 2 +- level_zero/core/source/module/module_imp.cpp | 4 +- .../unit_tests/sources/kernel/test_kernel.cpp | 6 +-- opencl/source/command_queue/command_queue.cpp | 2 +- opencl/source/command_queue/enqueue_kernel.h | 6 +-- .../source/command_queue/local_work_size.cpp | 4 +- .../aub_command_stream_receiver_hw_base.inl | 2 +- .../tbx_command_stream_receiver_hw.inl | 2 +- opencl/source/gtpin/gtpin_callbacks.cpp | 2 +- opencl/source/kernel/kernel.cpp | 10 ++--- opencl/source/kernel/kernel.h | 2 +- opencl/source/program/build.cpp | 4 +- opencl/source/program/kernel_info.cpp | 2 +- opencl/source/program/kernel_info.h | 1 - .../program/kernel_info_from_patchtokens.cpp | 2 +- opencl/source/program/link.cpp | 2 +- .../source/program/process_device_binary.cpp | 6 +-- opencl/source/program/program.cpp | 8 ++-- opencl/source/utilities/logger.cpp | 2 +- .../unit_test/built_ins/built_in_tests.cpp | 4 +- .../enqueue_fill_buffer_tests.cpp | 6 +-- .../command_queue/enqueue_handler_tests.cpp | 10 ++--- .../command_queue/enqueue_kernel_2_tests.cpp | 4 +- .../enqueue_svm_mem_copy_tests.cpp | 2 +- .../enqueue_svm_mem_fill_tests.cpp | 2 +- .../aub_command_stream_receiver_1_tests.cpp | 20 +++++----- .../command_stream/aub_subcapture_tests.cpp | 24 +++++------ .../tbx_command_stream_tests.cpp | 4 +- .../driver_diagnostics_enqueue_tests.cpp | 18 ++++----- .../context/driver_diagnostics_tests.cpp | 6 +-- .../enqueue_execution_model_kernel_tests.cpp | 2 +- .../fixtures/kernel_data_fixture.cpp | 2 +- .../kernel_reflection_surface_tests.cpp | 12 +++--- .../kernel_info_from_patchtokens_tests.cpp | 4 +- .../unit_test/program/kernel_info_tests.cpp | 4 +- .../program/process_debug_data_tests.cpp | 6 +-- .../unit_test/program/program_data_tests.cpp | 8 ++-- .../test/unit_test/program/program_tests.cpp | 40 +++++++++---------- .../program_with_block_kernels_tests.cpp | 4 +- .../source_level_debugger_tests.cpp | 16 ++++---- 40 files changed, 133 insertions(+), 134 deletions(-) diff --git a/level_zero/core/source/kernel/kernel_imp.cpp b/level_zero/core/source/kernel/kernel_imp.cpp index 3d42081bc3..6c4843467e 100644 --- a/level_zero/core/source/kernel/kernel_imp.cpp +++ b/level_zero/core/source/kernel/kernel_imp.cpp @@ -584,7 +584,7 @@ ze_result_t KernelImp::getProperties(ze_kernel_properties_t *pKernelProperties) NEO::KernelInfo *ki = nullptr; for (uint32_t i = 0; i < moduleImp->getTranslationUnit()->programInfo.kernelInfos.size(); i++) { ki = moduleImp->getTranslationUnit()->programInfo.kernelInfos[i]; - if (ki->name.compare(0, ki->name.size(), this->kernelImmData->getDescriptor().kernelMetadata.kernelName) == 0) { + if (ki->kernelDescriptor.kernelMetadata.kernelName.compare(0, ki->kernelDescriptor.kernelMetadata.kernelName.size(), this->kernelImmData->getDescriptor().kernelMetadata.kernelName) == 0) { break; } } diff --git a/level_zero/core/source/module/module_imp.cpp b/level_zero/core/source/module/module_imp.cpp index 8b9f5f045b..1b65d6492e 100644 --- a/level_zero/core/source/module/module_imp.cpp +++ b/level_zero/core/source/module/module_imp.cpp @@ -267,7 +267,7 @@ void ModuleTranslationUnit::processDebugData() { kernelName = reinterpret_cast(ptrOffset(kernelDebugHeader, sizeof(iOpenCL::SKernelDebugDataHeaderIGC))); auto kernelInfo = programInfo.kernelInfos[i]; - UNRECOVERABLE_IF(kernelInfo->name.compare(0, kernelInfo->name.size(), kernelName) != 0); + UNRECOVERABLE_IF(kernelInfo->kernelDescriptor.kernelMetadata.kernelName.compare(0, kernelInfo->kernelDescriptor.kernelMetadata.kernelName.size(), kernelName) != 0); kernelDebugData = ptrOffset(kernelName, kernelDebugHeader->KernelNameSize); @@ -473,7 +473,7 @@ bool ModuleImp::linkBinary() { if (moduleBuildLog) { std::vector kernelNames; for (const auto &kernelInfo : this->translationUnit->programInfo.kernelInfos) { - kernelNames.push_back("kernel : " + kernelInfo->name); + kernelNames.push_back("kernel : " + kernelInfo->kernelDescriptor.kernelMetadata.kernelName); } auto error = constructLinkerErrorMessage(unresolvedExternalsInfo, kernelNames); moduleBuildLog->appendString(error.c_str(), error.size()); diff --git a/level_zero/core/test/unit_tests/sources/kernel/test_kernel.cpp b/level_zero/core/test/unit_tests/sources/kernel/test_kernel.cpp index c1cc12398a..7a8558a034 100644 --- a/level_zero/core/test/unit_tests/sources/kernel/test_kernel.cpp +++ b/level_zero/core/test/unit_tests/sources/kernel/test_kernel.cpp @@ -288,7 +288,7 @@ HWTEST_F(KernelPropertiesTests, givenValidKernelThenPropertiesAreRetrieved) { NEO::KernelInfo *ki = nullptr; for (uint32_t i = 0; i < moduleImp->getTranslationUnit()->programInfo.kernelInfos.size(); i++) { ki = moduleImp->getTranslationUnit()->programInfo.kernelInfos[i]; - if (ki->name.compare(0, ki->name.size(), kernel->getImmutableData()->getDescriptor().kernelMetadata.kernelName) == 0) { + if (ki->kernelDescriptor.kernelMetadata.kernelName.compare(0, ki->kernelDescriptor.kernelMetadata.kernelName.size(), kernel->getImmutableData()->getDescriptor().kernelMetadata.kernelName) == 0) { break; } } @@ -414,7 +414,7 @@ HWTEST_F(KernelPropertiesTests, givenValidKernelAndNoMediavfestateThenSpillMemSi NEO::KernelInfo *ki = nullptr; for (uint32_t i = 0; i < moduleImp->getTranslationUnit()->programInfo.kernelInfos.size(); i++) { ki = moduleImp->getTranslationUnit()->programInfo.kernelInfos[i]; - if (ki->name.compare(0, ki->name.size(), kernel->getImmutableData()->getDescriptor().kernelMetadata.kernelName) == 0) { + if (ki->kernelDescriptor.kernelMetadata.kernelName.compare(0, ki->kernelDescriptor.kernelMetadata.kernelName.size(), kernel->getImmutableData()->getDescriptor().kernelMetadata.kernelName) == 0) { break; } } @@ -438,7 +438,7 @@ HWTEST_F(KernelPropertiesTests, givenValidKernelAndNollocateStatelessPrivateSurf NEO::KernelInfo *ki = nullptr; for (uint32_t i = 0; i < moduleImp->getTranslationUnit()->programInfo.kernelInfos.size(); i++) { ki = moduleImp->getTranslationUnit()->programInfo.kernelInfos[i]; - if (ki->name.compare(0, ki->name.size(), kernel->getImmutableData()->getDescriptor().kernelMetadata.kernelName) == 0) { + if (ki->kernelDescriptor.kernelMetadata.kernelName.compare(0, ki->kernelDescriptor.kernelMetadata.kernelName.size(), kernel->getImmutableData()->getDescriptor().kernelMetadata.kernelName) == 0) { break; } } diff --git a/opencl/source/command_queue/command_queue.cpp b/opencl/source/command_queue/command_queue.cpp index 46457b7cb4..0d57d957b4 100644 --- a/opencl/source/command_queue/command_queue.cpp +++ b/opencl/source/command_queue/command_queue.cpp @@ -698,7 +698,7 @@ void CommandQueue::aubCaptureHook(bool &blocking, bool &clearAllDependencies, co if (getGpgpuCommandStreamReceiver().getType() > CommandStreamReceiverType::CSR_HW) { for (auto &dispatchInfo : multiDispatchInfo) { - auto kernelName = dispatchInfo.getKernel()->getKernelInfo().name; + auto kernelName = dispatchInfo.getKernel()->getKernelInfo().kernelDescriptor.kernelMetadata.kernelName; getGpgpuCommandStreamReceiver().addAubComment(kernelName.c_str()); } } diff --git a/opencl/source/command_queue/enqueue_kernel.h b/opencl/source/command_queue/enqueue_kernel.h index 3efcf44589..c5ea498cf1 100644 --- a/opencl/source/command_queue/enqueue_kernel.h +++ b/opencl/source/command_queue/enqueue_kernel.h @@ -108,10 +108,10 @@ cl_int CommandQueueHw::enqueueKernel( if (context->isProvidingPerformanceHints()) { if (kernel.hasPrintfOutput()) { - context->providePerformanceHint(CL_CONTEXT_DIAGNOSTICS_LEVEL_NEUTRAL_INTEL, PRINTF_DETECTED_IN_KERNEL, kernel.getKernelInfo().name.c_str()); + context->providePerformanceHint(CL_CONTEXT_DIAGNOSTICS_LEVEL_NEUTRAL_INTEL, PRINTF_DETECTED_IN_KERNEL, kernel.getKernelInfo().kernelDescriptor.kernelMetadata.kernelName.c_str()); } if (kernel.requiresCoherency()) { - context->providePerformanceHint(CL_CONTEXT_DIAGNOSTICS_LEVEL_NEUTRAL_INTEL, KERNEL_REQUIRES_COHERENCY, kernel.getKernelInfo().name.c_str()); + context->providePerformanceHint(CL_CONTEXT_DIAGNOSTICS_LEVEL_NEUTRAL_INTEL, KERNEL_REQUIRES_COHERENCY, kernel.getKernelInfo().kernelDescriptor.kernelMetadata.kernelName.c_str()); } } @@ -121,7 +121,7 @@ cl_int CommandQueueHw::enqueueKernel( return err; } - DBG_LOG(PrintDispatchParameters, "Kernel: ", kernel.getKernelInfo().name, + DBG_LOG(PrintDispatchParameters, "Kernel: ", kernel.getKernelInfo().kernelDescriptor.kernelMetadata.kernelName, ",LWS:, ", localWorkSizeIn ? localWorkSizeIn[0] : 0, ",", localWorkSizeIn ? localWorkSizeIn[1] : 0, ",", localWorkSizeIn ? localWorkSizeIn[2] : 0, diff --git a/opencl/source/command_queue/local_work_size.cpp b/opencl/source/command_queue/local_work_size.cpp index ce8597b86e..ea5d086c52 100644 --- a/opencl/source/command_queue/local_work_size.cpp +++ b/opencl/source/command_queue/local_work_size.cpp @@ -474,7 +474,7 @@ void provideLocalWorkGroupSizeHints(Context *context, DispatchInfo dispatchInfo) preferredWorkGroupSize[2] = lws.z; if (dispatchInfo.getEnqueuedWorkgroupSize().x == 0) { - context->providePerformanceHint(CL_CONTEXT_DIAGNOSTICS_LEVEL_NEUTRAL_INTEL, NULL_LOCAL_WORKGROUP_SIZE, dispatchInfo.getKernel()->getKernelInfo().name.c_str(), + context->providePerformanceHint(CL_CONTEXT_DIAGNOSTICS_LEVEL_NEUTRAL_INTEL, NULL_LOCAL_WORKGROUP_SIZE, dispatchInfo.getKernel()->getKernelInfo().kernelDescriptor.kernelMetadata.kernelName.c_str(), preferredWorkGroupSize[0], preferredWorkGroupSize[1], preferredWorkGroupSize[2]); } else { size_t localWorkSizesIn[3] = {dispatchInfo.getEnqueuedWorkgroupSize().x, dispatchInfo.getEnqueuedWorkgroupSize().y, dispatchInfo.getEnqueuedWorkgroupSize().z}; @@ -482,7 +482,7 @@ void provideLocalWorkGroupSizeHints(Context *context, DispatchInfo dispatchInfo) if (localWorkSizesIn[i] != preferredWorkGroupSize[i]) { context->providePerformanceHint(CL_CONTEXT_DIAGNOSTICS_LEVEL_BAD_INTEL, BAD_LOCAL_WORKGROUP_SIZE, localWorkSizesIn[0], localWorkSizesIn[1], localWorkSizesIn[2], - dispatchInfo.getKernel()->getKernelInfo().name.c_str(), + dispatchInfo.getKernel()->getKernelInfo().kernelDescriptor.kernelMetadata.kernelName.c_str(), preferredWorkGroupSize[0], preferredWorkGroupSize[1], preferredWorkGroupSize[2]); break; } diff --git a/opencl/source/command_stream/aub_command_stream_receiver_hw_base.inl b/opencl/source/command_stream/aub_command_stream_receiver_hw_base.inl index 94e90eb80c..98443548ed 100644 --- a/opencl/source/command_stream/aub_command_stream_receiver_hw_base.inl +++ b/opencl/source/command_stream/aub_command_stream_receiver_hw_base.inl @@ -764,7 +764,7 @@ void AUBCommandStreamReceiverHw::dumpAllocation(GraphicsAllocation &g template AubSubCaptureStatus AUBCommandStreamReceiverHw::checkAndActivateAubSubCapture(const MultiDispatchInfo &dispatchInfo) { - std::string kernelName = dispatchInfo.peekMainKernel()->getKernelInfo().name; + std::string kernelName = dispatchInfo.peekMainKernel()->getKernelInfo().kernelDescriptor.kernelMetadata.kernelName; auto status = subCaptureManager->checkAndActivateSubCapture(kernelName); if (status.isActive) { std::string subCaptureFile = subCaptureManager->getSubCaptureFileName(kernelName); diff --git a/opencl/source/command_stream/tbx_command_stream_receiver_hw.inl b/opencl/source/command_stream/tbx_command_stream_receiver_hw.inl index 940d4a6081..48a99aa532 100644 --- a/opencl/source/command_stream/tbx_command_stream_receiver_hw.inl +++ b/opencl/source/command_stream/tbx_command_stream_receiver_hw.inl @@ -547,7 +547,7 @@ AubSubCaptureStatus TbxCommandStreamReceiverHw::checkAndActivateAubSu return {false, false}; } - std::string kernelName = (dispatchInfo.empty() ? "" : dispatchInfo.peekMainKernel()->getKernelInfo().name); + std::string kernelName = (dispatchInfo.empty() ? "" : dispatchInfo.peekMainKernel()->getKernelInfo().kernelDescriptor.kernelMetadata.kernelName); auto status = subCaptureManager->checkAndActivateSubCapture(kernelName); if (status.isActive && !status.wasActiveInPreviousEnqueue) { dumpTbxNonWritable = true; diff --git a/opencl/source/gtpin/gtpin_callbacks.cpp b/opencl/source/gtpin/gtpin_callbacks.cpp index 26b7cf86b5..8dbb095dae 100644 --- a/opencl/source/gtpin/gtpin_callbacks.cpp +++ b/opencl/source/gtpin/gtpin_callbacks.cpp @@ -89,7 +89,7 @@ void gtpinNotifyKernelCreate(cl_kernel kernel) { paramsIn.buffer_type = GTPIN_BUFFER_BINDFULL; paramsIn.buffer_desc.BTI = static_cast(gtpinBTI); paramsIn.igc_hash_id = kernelInfo.shaderHashCode; - paramsIn.kernel_name = (char *)kernelInfo.name.c_str(); + paramsIn.kernel_name = (char *)kernelInfo.kernelDescriptor.kernelMetadata.kernelName.c_str(); paramsIn.igc_info = kernelInfo.igcInfoForGtpin; paramsIn.debug_data = pKernel->getProgram()->getDebugData(); paramsIn.debug_data_size = static_cast(pKernel->getProgram()->getDebugDataSize()); diff --git a/opencl/source/kernel/kernel.cpp b/opencl/source/kernel/kernel.cpp index ca74685d07..0a99f9b5a3 100644 --- a/opencl/source/kernel/kernel.cpp +++ b/opencl/source/kernel/kernel.cpp @@ -458,8 +458,8 @@ cl_int Kernel::getInfo(cl_kernel_info paramName, size_t paramValueSize, switch (paramName) { case CL_KERNEL_FUNCTION_NAME: - pSrc = kernelInfo.name.c_str(); - srcSize = kernelInfo.name.length() + 1; + pSrc = kernelInfo.kernelDescriptor.kernelMetadata.kernelName.c_str(); + srcSize = kernelInfo.kernelDescriptor.kernelMetadata.kernelName.length() + 1; break; case CL_KERNEL_NUM_ARGS: @@ -2224,14 +2224,14 @@ void Kernel::provideInitializationHints() { return; if (privateSurfaceSize) { context->providePerformanceHint(CL_CONTEXT_DIAGNOSTICS_LEVEL_BAD_INTEL, PRIVATE_MEMORY_USAGE_TOO_HIGH, - kernelInfo.name.c_str(), privateSurfaceSize); + kernelInfo.kernelDescriptor.kernelMetadata.kernelName.c_str(), privateSurfaceSize); } if (patchInfo.mediavfestate) { auto scratchSize = patchInfo.mediavfestate->PerThreadScratchSpace; scratchSize *= device.getSharedDeviceInfo().computeUnitsUsedForScratch * getKernelInfo().getMaxSimdSize(); if (scratchSize > 0) { context->providePerformanceHint(CL_CONTEXT_DIAGNOSTICS_LEVEL_BAD_INTEL, REGISTER_PRESSURE_TOO_HIGH, - kernelInfo.name.c_str(), scratchSize); + kernelInfo.kernelDescriptor.kernelMetadata.kernelName.c_str(), scratchSize); } } } @@ -2373,7 +2373,7 @@ void Kernel::fillWithBuffersForAuxTranslation(MemObjsForAuxTranslation &memObjsF auto &context = this->program->getContext(); if (context.isProvidingPerformanceHints()) { context.providePerformanceHint(CL_CONTEXT_DIAGNOSTICS_LEVEL_BAD_INTEL, KERNEL_ARGUMENT_AUX_TRANSLATION, - kernelInfo.name.c_str(), i, kernelInfo.kernelArgInfo.at(i).metadataExtended->argName.c_str()); + kernelInfo.kernelDescriptor.kernelMetadata.kernelName.c_str(), i, kernelInfo.kernelArgInfo.at(i).metadataExtended->argName.c_str()); } } } diff --git a/opencl/source/kernel/kernel.h b/opencl/source/kernel/kernel.h index 6e38f90b9b..4d9267f168 100644 --- a/opencl/source/kernel/kernel.h +++ b/opencl/source/kernel/kernel.h @@ -97,7 +97,7 @@ class Kernel : public BaseObject<_cl_kernel> { if (FileLoggerInstance().enabled()) { std::string source; program->getSource(source); - FileLoggerInstance().dumpKernel(kernelInfo.name, source); + FileLoggerInstance().dumpKernel(kernelInfo.kernelDescriptor.kernelMetadata.kernelName, source); } return pKernel; diff --git a/opencl/source/program/build.cpp b/opencl/source/program/build.cpp index a699000712..3153c538b6 100644 --- a/opencl/source/program/build.cpp +++ b/opencl/source/program/build.cpp @@ -166,7 +166,7 @@ cl_int Program::build( if (clDevice->getSourceLevelDebugger()) { for (auto kernelInfo : kernelInfoArray) { clDevice->getSourceLevelDebugger()->notifyKernelDebugData(&kernelInfo->debugData, - kernelInfo->name, + kernelInfo->kernelDescriptor.kernelMetadata.kernelName, kernelInfo->heapInfo.pKernelHeap, kernelInfo->heapInfo.KernelHeapSize); } @@ -223,7 +223,7 @@ cl_int Program::build(const Device *pDevice, const char *buildOptions, bool enab } for (auto &ki : this->kernelInfoArray) { - auto fit = builtinsMap.find(ki->name); + auto fit = builtinsMap.find(ki->kernelDescriptor.kernelMetadata.kernelName); if (fit == builtinsMap.end()) { continue; } diff --git a/opencl/source/program/kernel_info.cpp b/opencl/source/program/kernel_info.cpp index ee2f9f2dbc..319f45d632 100644 --- a/opencl/source/program/kernel_info.cpp +++ b/opencl/source/program/kernel_info.cpp @@ -476,7 +476,7 @@ std::string concatenateKernelNames(ArrayRef kernelInfos) { if (!semiColonDelimitedKernelNameStr.empty()) { semiColonDelimitedKernelNameStr += ';'; } - semiColonDelimitedKernelNameStr += kernelInfo->name; + semiColonDelimitedKernelNameStr += kernelInfo->kernelDescriptor.kernelMetadata.kernelName; } return semiColonDelimitedKernelNameStr; diff --git a/opencl/source/program/kernel_info.h b/opencl/source/program/kernel_info.h index 2cb2140ed2..2de8157282 100644 --- a/opencl/source/program/kernel_info.h +++ b/opencl/source/program/kernel_info.h @@ -187,7 +187,6 @@ struct KernelInfo { bool createKernelAllocation(const Device &device); void apply(const DeviceInfoKernelPayloadConstants &constants); - std::string name; std::string attributes; HeapInfo heapInfo = {}; PatchInfo patchInfo = {}; diff --git a/opencl/source/program/kernel_info_from_patchtokens.cpp b/opencl/source/program/kernel_info_from_patchtokens.cpp index b11bc9f74c..1372927389 100644 --- a/opencl/source/program/kernel_info_from_patchtokens.cpp +++ b/opencl/source/program/kernel_info_from_patchtokens.cpp @@ -146,7 +146,7 @@ void populateKernelInfoArg(KernelInfo &dstKernelInfo, KernelArgInfo &dstKernelIn void populateKernelInfo(KernelInfo &dst, const PatchTokenBinary::KernelFromPatchtokens &src, uint32_t gpuPointerSizeInBytes) { UNRECOVERABLE_IF(nullptr == src.header); - dst.name = std::string(src.name.begin(), src.name.end()).c_str(); + dst.kernelDescriptor.kernelMetadata.kernelName = std::string(src.name.begin(), src.name.end()).c_str(); dst.heapInfo.DynamicStateHeapSize = src.header->DynamicStateHeapSize; dst.heapInfo.GeneralStateHeapSize = src.header->GeneralStateHeapSize; dst.heapInfo.SurfaceStateHeapSize = src.header->SurfaceStateHeapSize; diff --git a/opencl/source/program/link.cpp b/opencl/source/program/link.cpp index 902b30da52..f62111f7ac 100644 --- a/opencl/source/program/link.cpp +++ b/opencl/source/program/link.cpp @@ -172,7 +172,7 @@ cl_int Program::link( UNRECOVERABLE_IF(clDevice == nullptr); for (auto kernelInfo : kernelInfoArray) { clDevice->getSourceLevelDebugger()->notifyKernelDebugData(&kernelInfo->debugData, - kernelInfo->name, + kernelInfo->kernelDescriptor.kernelMetadata.kernelName, kernelInfo->heapInfo.pKernelHeap, kernelInfo->heapInfo.KernelHeapSize); } diff --git a/opencl/source/program/process_device_binary.cpp b/opencl/source/program/process_device_binary.cpp index 1ce7d740f0..7bd9593dd8 100644 --- a/opencl/source/program/process_device_binary.cpp +++ b/opencl/source/program/process_device_binary.cpp @@ -37,7 +37,7 @@ const KernelInfo *Program::getKernelInfo( } auto it = std::find_if(kernelInfoArray.begin(), kernelInfoArray.end(), - [=](const KernelInfo *kInfo) { return (0 == strcmp(kInfo->name.c_str(), kernelName)); }); + [=](const KernelInfo *kInfo) { return (0 == strcmp(kInfo->kernelDescriptor.kernelMetadata.kernelName.c_str(), kernelName)); }); return (it != kernelInfoArray.end()) ? *it : nullptr; } @@ -99,7 +99,7 @@ cl_int Program::linkBinary(Device *pDevice, const void *constantsInitData, const if (false == linkSuccess) { std::vector kernelNames; for (const auto &kernelInfo : this->kernelInfoArray) { - kernelNames.push_back("kernel : " + kernelInfo->name); + kernelNames.push_back("kernel : " + kernelInfo->kernelDescriptor.kernelMetadata.kernelName); } auto error = constructLinkerErrorMessage(unresolvedExternalsInfo, kernelNames); updateBuildLog(pDevice->getRootDeviceIndex(), error.c_str(), error.size()); @@ -230,7 +230,7 @@ void Program::processDebugData() { kernelName = reinterpret_cast(ptrOffset(kernelDebugHeader, sizeof(SKernelDebugDataHeaderIGC))); auto kernelInfo = kernelInfoArray[i]; - UNRECOVERABLE_IF(kernelInfo->name.compare(0, kernelInfo->name.size(), kernelName) != 0); + UNRECOVERABLE_IF(kernelInfo->kernelDescriptor.kernelMetadata.kernelName.compare(0, kernelInfo->kernelDescriptor.kernelMetadata.kernelName.size(), kernelName) != 0); kernelDebugData = ptrOffset(kernelName, kernelDebugHeader->KernelNameSize); diff --git a/opencl/source/program/program.cpp b/opencl/source/program/program.cpp index 67bdfbf8c7..28d067fe3c 100644 --- a/opencl/source/program/program.cpp +++ b/opencl/source/program/program.cpp @@ -294,19 +294,19 @@ void Program::separateBlockKernels() { auto allKernelInfos(kernelInfoArray); kernelInfoArray.clear(); for (auto &i : allKernelInfos) { - auto end = i->name.rfind("_dispatch_"); + auto end = i->kernelDescriptor.kernelMetadata.kernelName.rfind("_dispatch_"); if (end != std::string::npos) { bool baseKernelFound = false; - std::string baseKernelName(i->name, 0, end); + std::string baseKernelName(i->kernelDescriptor.kernelMetadata.kernelName, 0, end); for (auto &j : parentKernelInfoArray) { - if (j->name.compare(baseKernelName) == 0) { + if (j->kernelDescriptor.kernelMetadata.kernelName.compare(baseKernelName) == 0) { baseKernelFound = true; break; } } if (!baseKernelFound) { for (auto &j : subgroupKernelInfoArray) { - if (j->name.compare(baseKernelName) == 0) { + if (j->kernelDescriptor.kernelMetadata.kernelName.compare(baseKernelName) == 0) { baseKernelFound = true; break; } diff --git a/opencl/source/utilities/logger.cpp b/opencl/source/utilities/logger.cpp index c2fa2579da..975abb78c6 100644 --- a/opencl/source/utilities/logger.cpp +++ b/opencl/source/utilities/logger.cpp @@ -219,7 +219,7 @@ void FileLogger::dumpKernelArgs(const Kernel *kernel) { } if (ptr && size) { - fileName = kernel->getKernelInfo().name + "_arg_" + std::to_string(i) + "_" + type + "_size_" + std::to_string(size) + "_flags_" + std::to_string(flags) + ".bin"; + fileName = kernel->getKernelInfo().kernelDescriptor.kernelMetadata.kernelName + "_arg_" + std::to_string(i) + "_" + type + "_size_" + std::to_string(size) + "_flags_" + std::to_string(flags) + ".bin"; writeToFile(fileName, ptr, size, std::ios::trunc | std::ios::binary); } } diff --git a/opencl/test/unit_test/built_ins/built_in_tests.cpp b/opencl/test/unit_test/built_ins/built_in_tests.cpp index 6f9638e981..0565896771 100644 --- a/opencl/test/unit_test/built_ins/built_in_tests.cpp +++ b/opencl/test/unit_test/built_ins/built_in_tests.cpp @@ -820,7 +820,7 @@ TEST_F(BuiltInTests, GivenUnalignedCopyBufferToBufferWhenDispatchInfoIsCreatedTh const DispatchInfo *dispatchInfo = multiDispatchInfo.begin(); - EXPECT_EQ(dispatchInfo->getKernel()->getKernelInfo().name, "CopyBufferToBufferLeftLeftover"); + EXPECT_EQ(dispatchInfo->getKernel()->getKernelInfo().kernelDescriptor.kernelMetadata.kernelName, "CopyBufferToBufferLeftLeftover"); EXPECT_TRUE(compareBuiltinOpParams(multiDispatchInfo.peekBuiltinOpParams(), builtinOpsParams)); } @@ -916,7 +916,7 @@ HWCMDTEST_F(IGFX_GEN8_CORE, BuiltInTests, WhenGettingSchedulerKernelThenCorrectK if (pClDevice->areOcl21FeaturesSupported()) { SchedulerKernel &schedulerKernel = pContext->getSchedulerKernel(); std::string name = SchedulerKernel::schedulerName; - EXPECT_EQ(name, schedulerKernel.getKernelInfo().name); + EXPECT_EQ(name, schedulerKernel.getKernelInfo().kernelDescriptor.kernelMetadata.kernelName); } } diff --git a/opencl/test/unit_test/command_queue/enqueue_fill_buffer_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_fill_buffer_tests.cpp index 596ffc654d..7e4fe5d293 100644 --- a/opencl/test/unit_test/command_queue/enqueue_fill_buffer_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_fill_buffer_tests.cpp @@ -146,7 +146,7 @@ HWTEST_F(EnqueueFillBufferCmdTests, FillBufferRightLeftover) { EXPECT_EQ(1u, mdi.size()); auto kernel = mdi.begin()->getKernel(); - EXPECT_STREQ("FillBufferRightLeftover", kernel->getKernelInfo().name.c_str()); + EXPECT_STREQ("FillBufferRightLeftover", kernel->getKernelInfo().kernelDescriptor.kernelMetadata.kernelName.c_str()); context.getMemoryManager()->freeGraphicsMemory(patternAllocation); } @@ -173,7 +173,7 @@ HWTEST_F(EnqueueFillBufferCmdTests, FillBufferMiddle) { EXPECT_EQ(1u, mdi.size()); auto kernel = mdi.begin()->getKernel(); - EXPECT_STREQ("FillBufferMiddle", kernel->getKernelInfo().name.c_str()); + EXPECT_STREQ("FillBufferMiddle", kernel->getKernelInfo().kernelDescriptor.kernelMetadata.kernelName.c_str()); context.getMemoryManager()->freeGraphicsMemory(patternAllocation); } @@ -200,7 +200,7 @@ HWTEST_F(EnqueueFillBufferCmdTests, FillBufferLeftLeftover) { EXPECT_EQ(1u, mdi.size()); auto kernel = mdi.begin()->getKernel(); - EXPECT_STREQ("FillBufferLeftLeftover", kernel->getKernelInfo().name.c_str()); + EXPECT_STREQ("FillBufferLeftLeftover", kernel->getKernelInfo().kernelDescriptor.kernelMetadata.kernelName.c_str()); context.getMemoryManager()->freeGraphicsMemory(patternAllocation); } diff --git a/opencl/test/unit_test/command_queue/enqueue_handler_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_handler_tests.cpp index 70523d7eaf..4e0f496521 100644 --- a/opencl/test/unit_test/command_queue/enqueue_handler_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_handler_tests.cpp @@ -53,7 +53,7 @@ HWTEST_F(EnqueueHandlerTest, givenEnqueueHandlerWithKernelWhenAubCsrIsActiveThen auto mockCmdQ = std::unique_ptr>(new MockCommandQueueHw(context, pClDevice, 0)); size_t gws[] = {1, 1, 1}; - mockKernel.kernelInfo.name = "kernel_name"; + mockKernel.kernelInfo.kernelDescriptor.kernelMetadata.kernelName = "kernel_name"; mockCmdQ->enqueueKernel(mockKernel.mockKernel, 1, nullptr, gws, nullptr, 0, nullptr, nullptr); EXPECT_TRUE(aubCsr->addAubCommentCalled); @@ -69,8 +69,8 @@ HWTEST_F(EnqueueHandlerTest, givenEnqueueHandlerWithKernelSplitWhenAubCsrIsActiv MockKernelWithInternals kernel1(*pClDevice); MockKernelWithInternals kernel2(*pClDevice); - kernel1.kernelInfo.name = "kernel_1"; - kernel2.kernelInfo.name = "kernel_2"; + kernel1.kernelInfo.kernelDescriptor.kernelMetadata.kernelName = "kernel_1"; + kernel2.kernelInfo.kernelDescriptor.kernelMetadata.kernelName = "kernel_2"; auto mockCmdQ = std::unique_ptr>(new MockCommandQueueHw(context, pClDevice, 0)); MockMultiDispatchInfo multiDispatchInfo(std::vector({kernel1.mockKernel, kernel2.mockKernel})); @@ -93,7 +93,7 @@ HWTEST_F(EnqueueHandlerTest, givenEnqueueHandlerWithEmptyDispatchInfoWhenAubCsrI auto mockCmdQ = std::unique_ptr>(new MockCommandQueueHw(context, pClDevice, 0)); size_t gws[] = {0, 0, 0}; - mockKernel.kernelInfo.name = "kernel_name"; + mockKernel.kernelInfo.kernelDescriptor.kernelMetadata.kernelName = "kernel_name"; mockCmdQ->enqueueKernel(mockKernel.mockKernel, 1, nullptr, gws, nullptr, 0, nullptr, nullptr); EXPECT_FALSE(aubCsr->addAubCommentCalled); @@ -159,7 +159,7 @@ HWTEST_F(EnqueueHandlerWithAubSubCaptureTests, givenEnqueueHandlerWithAubSubCapt MockCmdQWithAubSubCapture cmdQ(context, pClDevice); MockKernelWithInternals mockKernel(*pClDevice); - mockKernel.kernelInfo.name = "kernelName"; + mockKernel.kernelInfo.kernelDescriptor.kernelMetadata.kernelName = "kernelName"; size_t gws[3] = {1, 0, 0}; // activate subcapture diff --git a/opencl/test/unit_test/command_queue/enqueue_kernel_2_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_kernel_2_tests.cpp index 49ac307bee..1af7271e2a 100644 --- a/opencl/test/unit_test/command_queue/enqueue_kernel_2_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_kernel_2_tests.cpp @@ -909,13 +909,13 @@ HWTEST_F(EnqueueAuxKernelTests, givenKernelWithRequiredAuxTranslationWhenEnqueue // before kernel EXPECT_EQ(1u, std::get(cmdQ.dispatchAuxTranslationInputs.at(0))); // aux before NDR auto kernelBefore = std::get(cmdQ.dispatchAuxTranslationInputs.at(0)); - EXPECT_EQ("fullCopy", kernelBefore->getKernelInfo().name); + EXPECT_EQ("fullCopy", kernelBefore->getKernelInfo().kernelDescriptor.kernelMetadata.kernelName); EXPECT_TRUE(kernelBefore->isBuiltIn); // after kernel EXPECT_EQ(3u, std::get(cmdQ.dispatchAuxTranslationInputs.at(1))); // aux + NDR + aux auto kernelAfter = std::get(cmdQ.dispatchAuxTranslationInputs.at(1)); - EXPECT_EQ("fullCopy", kernelAfter->getKernelInfo().name); + EXPECT_EQ("fullCopy", kernelAfter->getKernelInfo().kernelDescriptor.kernelMetadata.kernelName); EXPECT_TRUE(kernelAfter->isBuiltIn); } diff --git a/opencl/test/unit_test/command_queue/enqueue_svm_mem_copy_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_svm_mem_copy_tests.cpp index b0290513bc..68b3d0558f 100644 --- a/opencl/test/unit_test/command_queue/enqueue_svm_mem_copy_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_svm_mem_copy_tests.cpp @@ -138,7 +138,7 @@ HWTEST_F(EnqueueSvmMemCopyTest, givenEnqueueSVMMemcpyWhenUsingCopyBufferToBuffer EXPECT_EQ(Vec3(256 / middleElSize, 1, 1), di->getGWS()); auto kernel = mdi->begin()->getKernel(); - EXPECT_EQ("CopyBufferToBufferMiddle", kernel->getKernelInfo().name); + EXPECT_EQ("CopyBufferToBufferMiddle", kernel->getKernelInfo().kernelDescriptor.kernelMetadata.kernelName); } HWTEST_F(EnqueueSvmMemCopyTest, givenEnqueueSVMMemcpyWhenUsingCopyBufferToBufferBuilderAndSrcHostPtrThenItConfiguredWithBuiltinOpsAndProducesDispatchInfo) { diff --git a/opencl/test/unit_test/command_queue/enqueue_svm_mem_fill_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_svm_mem_fill_tests.cpp index 7c9c02942b..3ab4914e1c 100644 --- a/opencl/test/unit_test/command_queue/enqueue_svm_mem_fill_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_svm_mem_fill_tests.cpp @@ -139,7 +139,7 @@ HWTEST_P(EnqueueSvmMemFillTest, givenEnqueueSVMMemFillWhenUsingFillBufferBuilder EXPECT_EQ(Vec3(256 / middleElSize, 1, 1), di->getGWS()); auto kernel = di->getKernel(); - EXPECT_STREQ("FillBufferMiddle", kernel->getKernelInfo().name.c_str()); + EXPECT_STREQ("FillBufferMiddle", kernel->getKernelInfo().kernelDescriptor.kernelMetadata.kernelName.c_str()); } INSTANTIATE_TEST_CASE_P(size_t, diff --git a/opencl/test/unit_test/command_stream/aub_command_stream_receiver_1_tests.cpp b/opencl/test/unit_test/command_stream/aub_command_stream_receiver_1_tests.cpp index 2394f7067f..3e4714a184 100644 --- a/opencl/test/unit_test/command_stream/aub_command_stream_receiver_1_tests.cpp +++ b/opencl/test/unit_test/command_stream/aub_command_stream_receiver_1_tests.cpp @@ -893,7 +893,7 @@ HWTEST_F(AubCommandStreamReceiverTests, givenAubCommandStreamReceiverInSubCaptur aubCsr->subCaptureManager = std::unique_ptr(subCaptureManagerMock); MockKernelWithInternals kernelInternals(*pClDevice); - kernelInternals.kernelInfo.name = "kernelName"; + kernelInternals.kernelInfo.kernelDescriptor.kernelMetadata.kernelName = "kernelName"; Kernel *kernel = kernelInternals.mockKernel; MockMultiDispatchInfo multiDispatchInfo(kernel); @@ -918,7 +918,7 @@ HWTEST_F(AubCommandStreamReceiverTests, givenAubCommandStreamReceiverInSubCaptur MockKernelWithInternals kernelInternals(*pClDevice); MockMultiDispatchInfo multiDispatchInfo(kernelInternals.mockKernel); - std::string fileName = aubCsr->subCaptureManager->getSubCaptureFileName(kernelInternals.kernelInfo.name); + std::string fileName = aubCsr->subCaptureManager->getSubCaptureFileName(kernelInternals.kernelInfo.kernelDescriptor.kernelMetadata.kernelName); aubCsr->initFile(fileName); ASSERT_TRUE(aubCsr->isFileOpen()); @@ -942,7 +942,7 @@ HWTEST_F(AubCommandStreamReceiverTests, givenAubCommandStreamReceiverInSubCaptur aubCsr->subCaptureManager = std::unique_ptr(subCaptureManagerMock); MockKernelWithInternals kernelInternals(*pClDevice); - kernelInternals.kernelInfo.name = "kernelName"; + kernelInternals.kernelInfo.kernelDescriptor.kernelMetadata.kernelName = "kernelName"; MockMultiDispatchInfo multiDispatchInfo(kernelInternals.mockKernel); std::string fileName = "file_name.aub"; @@ -971,7 +971,7 @@ HWTEST_F(AubCommandStreamReceiverTests, givenAubCommandStreamReceiverInSubCaptur aubCsr->subCaptureManager = std::unique_ptr(subCaptureManagerMock); MockKernelWithInternals kernelInternals(*pClDevice); - kernelInternals.kernelInfo.name = "kernelName"; + kernelInternals.kernelInfo.kernelDescriptor.kernelMetadata.kernelName = "kernelName"; MockMultiDispatchInfo multiDispatchInfo(kernelInternals.mockKernel); std::string fileName = "file_name.aub"; @@ -998,7 +998,7 @@ HWTEST_F(AubCommandStreamReceiverTests, givenAubCommandStreamReceiverInSubCaptur aubCsr->subCaptureManager = std::unique_ptr(subCaptureManagerMock); MockKernelWithInternals kernelInternals(*pClDevice); - kernelInternals.kernelInfo.name = "kernelName"; + kernelInternals.kernelInfo.kernelDescriptor.kernelMetadata.kernelName = "kernelName"; MockMultiDispatchInfo multiDispatchInfo(kernelInternals.mockKernel); aubCsr->checkAndActivateAubSubCapture(multiDispatchInfo); @@ -1020,7 +1020,7 @@ HWTEST_F(AubCommandStreamReceiverTests, givenAubCommandStreamReceiverInSubCaptur MockKernelWithInternals kernelInternals(*pClDevice); MockMultiDispatchInfo multiDispatchInfo(kernelInternals.mockKernel); - aubCsr->initFile(aubCsr->subCaptureManager->getSubCaptureFileName(kernelInternals.kernelInfo.name)); + aubCsr->initFile(aubCsr->subCaptureManager->getSubCaptureFileName(kernelInternals.kernelInfo.kernelDescriptor.kernelMetadata.kernelName)); aubCsr->checkAndActivateAubSubCapture(multiDispatchInfo); EXPECT_FALSE(aubCsr->dumpAubNonWritable); @@ -1038,7 +1038,7 @@ HWTEST_F(AubCommandStreamReceiverTests, givenAubCommandStreamReceiverInSubCaptur aubCsr->subCaptureManager = std::unique_ptr(subCaptureManagerMock); MockKernelWithInternals kernelInternals(*pClDevice); - kernelInternals.kernelInfo.name = "kernelName"; + kernelInternals.kernelInfo.kernelDescriptor.kernelMetadata.kernelName = "kernelName"; Kernel *kernel = kernelInternals.mockKernel; MockMultiDispatchInfo multiDispatchInfo(kernel); @@ -1059,7 +1059,7 @@ HWTEST_F(AubCommandStreamReceiverTests, givenAubCommandStreamReceiverInSubCaptur aubCsr->subCaptureManager = std::unique_ptr(subCaptureManagerMock); MockKernelWithInternals kernelInternals(*pClDevice); - kernelInternals.kernelInfo.name = "kernelName"; + kernelInternals.kernelInfo.kernelDescriptor.kernelMetadata.kernelName = "kernelName"; MockMultiDispatchInfo multiDispatchInfo(kernelInternals.mockKernel); aubCsr->checkAndActivateAubSubCapture(multiDispatchInfo); @@ -1119,7 +1119,7 @@ HWTEST_F(AubCommandStreamReceiverTests, givenAubCommandStreamReceiverInStandalon aubCsr->subCaptureManager = std::unique_ptr(subCaptureManagerMock); MockKernelWithInternals kernelInternals(*pClDevice); - kernelInternals.kernelInfo.name = "kernelName"; + kernelInternals.kernelInfo.kernelDescriptor.kernelMetadata.kernelName = "kernelName"; MockMultiDispatchInfo multiDispatchInfo(kernelInternals.mockKernel); aubCsr->checkAndActivateAubSubCapture(multiDispatchInfo); @@ -1140,7 +1140,7 @@ HWTEST_F(AubCommandStreamReceiverTests, givenAubCommandStreamReceiverInStandalon aubCsr->subCaptureManager = std::unique_ptr(subCaptureManagerMock); MockKernelWithInternals kernelInternals(*pClDevice); - kernelInternals.kernelInfo.name = "kernelName"; + kernelInternals.kernelInfo.kernelDescriptor.kernelMetadata.kernelName = "kernelName"; MockMultiDispatchInfo multiDispatchInfo(kernelInternals.mockKernel); aubCsr->checkAndActivateAubSubCapture(multiDispatchInfo); diff --git a/opencl/test/unit_test/command_stream/aub_subcapture_tests.cpp b/opencl/test/unit_test/command_stream/aub_subcapture_tests.cpp index 93251e0460..7485b2c511 100644 --- a/opencl/test/unit_test/command_stream/aub_subcapture_tests.cpp +++ b/opencl/test/unit_test/command_stream/aub_subcapture_tests.cpp @@ -22,7 +22,7 @@ struct AubSubCaptureTest : public ClDeviceFixture, void SetUp() override { ClDeviceFixture::SetUp(); program = std::make_unique(toClDeviceVector(*pClDevice)); - kernelInfo.name = "kernel_name"; + kernelInfo.kernelDescriptor.kernelMetadata.kernelName = "kernel_name"; dbgRestore = new DebugManagerStateRestore(); } @@ -156,7 +156,7 @@ TEST_F(AubSubCaptureTest, givenSubCaptureManagerInFilterModeWhenCheckAndActivate AubSubCaptureManagerMock aubSubCaptureManager("", subCaptureCommon); subCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::Filter; - auto status = aubSubCaptureManager.checkAndActivateSubCapture(kernelInfo.name); + auto status = aubSubCaptureManager.checkAndActivateSubCapture(kernelInfo.kernelDescriptor.kernelMetadata.kernelName); EXPECT_TRUE(status.isActive); EXPECT_TRUE(aubSubCaptureManager.isSubCaptureActive()); } @@ -166,7 +166,7 @@ TEST_F(AubSubCaptureTest, givenSubCaptureManagerInFilterModeWhenCheckAndActivate subCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::Filter; subCaptureCommon.subCaptureFilter.dumpKernelStartIdx = 0; - auto status = aubSubCaptureManager.checkAndActivateSubCapture(kernelInfo.name); + auto status = aubSubCaptureManager.checkAndActivateSubCapture(kernelInfo.kernelDescriptor.kernelMetadata.kernelName); EXPECT_TRUE(status.isActive); EXPECT_FALSE(status.wasActiveInPreviousEnqueue); } @@ -176,7 +176,7 @@ TEST_F(AubSubCaptureTest, givenSubCaptureManagerInFilterModeWhenCheckAndActivate subCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::Filter; subCaptureCommon.subCaptureFilter.dumpKernelStartIdx = 1; - auto status = aubSubCaptureManager.checkAndActivateSubCapture(kernelInfo.name); + auto status = aubSubCaptureManager.checkAndActivateSubCapture(kernelInfo.kernelDescriptor.kernelMetadata.kernelName); EXPECT_FALSE(status.isActive); EXPECT_FALSE(status.wasActiveInPreviousEnqueue); } @@ -187,7 +187,7 @@ TEST_F(AubSubCaptureTest, givenSubCaptureManagerInFilterModeWhenCheckAndActivate subCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::Filter; subCaptureCommon.subCaptureFilter.dumpKernelEndIdx = 0; subCaptureCommon.getKernelCurrentIndexAndIncrement(); - auto status = aubSubCaptureManager.checkAndActivateSubCapture(kernelInfo.name); + auto status = aubSubCaptureManager.checkAndActivateSubCapture(kernelInfo.kernelDescriptor.kernelMetadata.kernelName); EXPECT_FALSE(status.isActive); EXPECT_FALSE(status.wasActiveInPreviousEnqueue); } @@ -197,7 +197,7 @@ TEST_F(AubSubCaptureTest, givenSubCaptureManagerInFilterModeWhenCheckAndActivate subCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::Filter; subCaptureCommon.subCaptureFilter.dumpKernelName = "kernel_name"; - auto status = aubSubCaptureManager.checkAndActivateSubCapture(kernelInfo.name); + auto status = aubSubCaptureManager.checkAndActivateSubCapture(kernelInfo.kernelDescriptor.kernelMetadata.kernelName); EXPECT_TRUE(status.isActive); EXPECT_FALSE(status.wasActiveInPreviousEnqueue); } @@ -207,7 +207,7 @@ TEST_F(AubSubCaptureTest, givenSubCaptureManagerInFilterModeWhenCheckAndActivate subCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::Filter; subCaptureCommon.subCaptureFilter.dumpKernelName = "invalid_kernel_name"; - auto status = aubSubCaptureManager.checkAndActivateSubCapture(kernelInfo.name); + auto status = aubSubCaptureManager.checkAndActivateSubCapture(kernelInfo.kernelDescriptor.kernelMetadata.kernelName); EXPECT_FALSE(status.isActive); EXPECT_FALSE(status.wasActiveInPreviousEnqueue); } @@ -334,8 +334,8 @@ TEST_F(AubSubCaptureTest, givenSubCaptureManagerInToggleModeWhenGetSubCaptureFil aubSubCaptureManager.setToggleFileName(""); subCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::Toggle; - std::string toggleFileName = aubSubCaptureManager.generateToggleFileName(kernelInfo.name); - EXPECT_STREQ(toggleFileName.c_str(), aubSubCaptureManager.getSubCaptureFileName(kernelInfo.name).c_str()); + std::string toggleFileName = aubSubCaptureManager.generateToggleFileName(kernelInfo.kernelDescriptor.kernelMetadata.kernelName); + EXPECT_STREQ(toggleFileName.c_str(), aubSubCaptureManager.getSubCaptureFileName(kernelInfo.kernelDescriptor.kernelMetadata.kernelName).c_str()); } TEST_F(AubSubCaptureTest, givenSubCaptureManagerInToggleModeWhenGetSubCaptureFileNameIsCalledForEmptyDispatchInfoThenGenerateToggleFileNameWithoutKernelName) { @@ -435,15 +435,15 @@ TEST_F(AubSubCaptureTest, givenSubCaptureManagerInFilterModeWhenKernelNameIsSpec subCaptureCommon.subCaptureFilter.dumpKernelName = kernelName; subCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::Filter; - auto status = aubSubCaptureManager.checkAndActivateSubCapture(kernelInfo.name); + auto status = aubSubCaptureManager.checkAndActivateSubCapture(kernelInfo.kernelDescriptor.kernelMetadata.kernelName); EXPECT_FALSE(status.isActive); EXPECT_FALSE(aubSubCaptureManager.isSubCaptureActive()); - status = aubSubCaptureManager.checkAndActivateSubCapture(kernelInfo.name); + status = aubSubCaptureManager.checkAndActivateSubCapture(kernelInfo.kernelDescriptor.kernelMetadata.kernelName); EXPECT_TRUE(status.isActive); EXPECT_TRUE(aubSubCaptureManager.isSubCaptureActive()); - status = aubSubCaptureManager.checkAndActivateSubCapture(kernelInfo.name); + status = aubSubCaptureManager.checkAndActivateSubCapture(kernelInfo.kernelDescriptor.kernelMetadata.kernelName); EXPECT_FALSE(status.isActive); EXPECT_FALSE(aubSubCaptureManager.isSubCaptureActive()); } diff --git a/opencl/test/unit_test/command_stream/tbx_command_stream_tests.cpp b/opencl/test/unit_test/command_stream/tbx_command_stream_tests.cpp index e1ed594683..8190b0e9d4 100644 --- a/opencl/test/unit_test/command_stream/tbx_command_stream_tests.cpp +++ b/opencl/test/unit_test/command_stream/tbx_command_stream_tests.cpp @@ -886,7 +886,7 @@ HWTEST_F(TbxCommandStreamTests, givenTbxCsrInSubCaptureModeWhenCheckAndActivateA tbxCsr.subCaptureManager = std::unique_ptr(aubSubCaptureManagerMock); MockKernelWithInternals kernelInternals(*pClDevice); - kernelInternals.kernelInfo.name = "kernelName"; + kernelInternals.kernelInfo.kernelDescriptor.kernelMetadata.kernelName = "kernelName"; Kernel *kernel = kernelInternals.mockKernel; MockMultiDispatchInfo multiDispatchInfo(kernel); @@ -912,7 +912,7 @@ HWTEST_F(TbxCommandStreamTests, givenTbxCsrInSubCaptureModeWhenCheckAndActivateA tbxCsr.subCaptureManager = std::unique_ptr(aubSubCaptureManagerMock); MockKernelWithInternals kernelInternals(*pClDevice); - kernelInternals.kernelInfo.name = "kernelName"; + kernelInternals.kernelInfo.kernelDescriptor.kernelMetadata.kernelName = "kernelName"; Kernel *kernel = kernelInternals.mockKernel; MockMultiDispatchInfo multiDispatchInfo(kernel); diff --git a/opencl/test/unit_test/context/driver_diagnostics_enqueue_tests.cpp b/opencl/test/unit_test/context/driver_diagnostics_enqueue_tests.cpp index 70bb33e067..ae5ddef55b 100644 --- a/opencl/test/unit_test/context/driver_diagnostics_enqueue_tests.cpp +++ b/opencl/test/unit_test/context/driver_diagnostics_enqueue_tests.cpp @@ -679,7 +679,7 @@ TEST_F(PerformanceHintEnqueueKernelTest, GivenNullLocalSizeAndEnableComputeWorkS retVal = pCmdQ->enqueueKernel(kernel, 1, nullptr, globalWorkGroupSize, nullptr, 0, nullptr, nullptr); EXPECT_EQ(CL_SUCCESS, retVal); - snprintf(expectedHint, DriverDiagnostics::maxHintStringSize, DriverDiagnostics::hintFormat[NULL_LOCAL_WORKGROUP_SIZE], kernel->getKernelInfo().name.c_str(), + snprintf(expectedHint, DriverDiagnostics::maxHintStringSize, DriverDiagnostics::hintFormat[NULL_LOCAL_WORKGROUP_SIZE], kernel->getKernelInfo().kernelDescriptor.kernelMetadata.kernelName.c_str(), *kernel->localWorkSizeX, *kernel->localWorkSizeY, *kernel->localWorkSizeZ); EXPECT_TRUE(containsHint(expectedHint, userData)); } @@ -691,7 +691,7 @@ TEST_F(PerformanceHintEnqueueKernelTest, GivenNullLocalSizeAndEnableComputeWorkS retVal = pCmdQ->enqueueKernel(kernel, 1, nullptr, globalWorkGroupSize, nullptr, 0, nullptr, nullptr); EXPECT_EQ(CL_SUCCESS, retVal); - snprintf(expectedHint, DriverDiagnostics::maxHintStringSize, DriverDiagnostics::hintFormat[NULL_LOCAL_WORKGROUP_SIZE], kernel->getKernelInfo().name.c_str(), + snprintf(expectedHint, DriverDiagnostics::maxHintStringSize, DriverDiagnostics::hintFormat[NULL_LOCAL_WORKGROUP_SIZE], kernel->getKernelInfo().kernelDescriptor.kernelMetadata.kernelName.c_str(), *kernel->localWorkSizeX, *kernel->localWorkSizeY, *kernel->localWorkSizeZ); EXPECT_TRUE(containsHint(expectedHint, userData)); DebugManager.flags.EnableComputeWorkSizeND.set(isWorkGroupSizeEnabled); @@ -704,7 +704,7 @@ TEST_F(PerformanceHintEnqueueKernelTest, GivenNullLocalSizeAndEnableComputeWorkS retVal = pCmdQ->enqueueKernel(kernel, 1, nullptr, globalWorkGroupSize, nullptr, 0, nullptr, nullptr); EXPECT_EQ(CL_SUCCESS, retVal); - snprintf(expectedHint, DriverDiagnostics::maxHintStringSize, DriverDiagnostics::hintFormat[NULL_LOCAL_WORKGROUP_SIZE], kernel->getKernelInfo().name.c_str(), + snprintf(expectedHint, DriverDiagnostics::maxHintStringSize, DriverDiagnostics::hintFormat[NULL_LOCAL_WORKGROUP_SIZE], kernel->getKernelInfo().kernelDescriptor.kernelMetadata.kernelName.c_str(), *kernel->localWorkSizeX, *kernel->localWorkSizeY, *kernel->localWorkSizeZ); EXPECT_TRUE(containsHint(expectedHint, userData)); DebugManager.flags.EnableComputeWorkSizeND.set(isWorkGroupSizeEnabled); @@ -715,7 +715,7 @@ TEST_F(PerformanceHintEnqueueKernelTest, GivenNullLocalSizeAndEnableComputeWorkS retVal = pCmdQ->enqueueKernel(kernel, 1, nullptr, globalWorkGroupSize, nullptr, 0, nullptr, nullptr); EXPECT_EQ(CL_SUCCESS, retVal); - snprintf(expectedHint, DriverDiagnostics::maxHintStringSize, DriverDiagnostics::hintFormat[NULL_LOCAL_WORKGROUP_SIZE], kernel->getKernelInfo().name.c_str(), + snprintf(expectedHint, DriverDiagnostics::maxHintStringSize, DriverDiagnostics::hintFormat[NULL_LOCAL_WORKGROUP_SIZE], kernel->getKernelInfo().kernelDescriptor.kernelMetadata.kernelName.c_str(), *kernel->localWorkSizeX, *kernel->localWorkSizeY, *kernel->localWorkSizeZ); EXPECT_TRUE(containsHint(expectedHint, userData)); } @@ -728,7 +728,7 @@ TEST_F(PerformanceHintEnqueueKernelTest, GivenNullLocalSizeAndEnableComputeWorkS retVal = pCmdQ->enqueueKernel(kernel, 1, nullptr, globalWorkGroupSize, nullptr, 0, nullptr, nullptr); EXPECT_EQ(CL_SUCCESS, retVal); - snprintf(expectedHint, DriverDiagnostics::maxHintStringSize, DriverDiagnostics::hintFormat[NULL_LOCAL_WORKGROUP_SIZE], kernel->getKernelInfo().name.c_str(), + snprintf(expectedHint, DriverDiagnostics::maxHintStringSize, DriverDiagnostics::hintFormat[NULL_LOCAL_WORKGROUP_SIZE], kernel->getKernelInfo().kernelDescriptor.kernelMetadata.kernelName.c_str(), *kernel->localWorkSizeX, *kernel->localWorkSizeY, *kernel->localWorkSizeZ); EXPECT_TRUE(containsHint(expectedHint, userData)); } @@ -741,7 +741,7 @@ TEST_F(PerformanceHintEnqueueKernelTest, GivenNullLocalSizeAndEnableComputeWorkS retVal = pCmdQ->enqueueKernel(kernel, 1, nullptr, globalWorkGroupSize, nullptr, 0, nullptr, nullptr); EXPECT_EQ(CL_SUCCESS, retVal); - snprintf(expectedHint, DriverDiagnostics::maxHintStringSize, DriverDiagnostics::hintFormat[NULL_LOCAL_WORKGROUP_SIZE], kernel->getKernelInfo().name.c_str(), + snprintf(expectedHint, DriverDiagnostics::maxHintStringSize, DriverDiagnostics::hintFormat[NULL_LOCAL_WORKGROUP_SIZE], kernel->getKernelInfo().kernelDescriptor.kernelMetadata.kernelName.c_str(), *kernel->localWorkSizeX, *kernel->localWorkSizeY, *kernel->localWorkSizeZ); EXPECT_TRUE(containsHint(expectedHint, userData)); } @@ -770,7 +770,7 @@ TEST_P(PerformanceHintEnqueueKernelBadSizeTest, GivenBadLocalWorkGroupSizeWhenEn EXPECT_EQ(CL_SUCCESS, retVal); snprintf(expectedHint, DriverDiagnostics::maxHintStringSize, DriverDiagnostics::hintFormat[BAD_LOCAL_WORKGROUP_SIZE], - localWorkGroupSize[0], localWorkGroupSize[1], localWorkGroupSize[2], kernel->getKernelInfo().name.c_str(), + localWorkGroupSize[0], localWorkGroupSize[1], localWorkGroupSize[2], kernel->getKernelInfo().kernelDescriptor.kernelMetadata.kernelName.c_str(), computedLocalWorkgroupSize.x, computedLocalWorkgroupSize.y, computedLocalWorkgroupSize.z); EXPECT_TRUE(containsHint(expectedHint, userData)); } @@ -786,7 +786,7 @@ TEST_F(PerformanceHintEnqueueKernelPrintfTest, GivenKernelWithPrintfWhenEnqueueK retVal = pCmdQ->enqueueKernel(kernel, 3, nullptr, globalWorkGroupSize, preferredWorkGroupSize, 0, nullptr, nullptr); EXPECT_EQ(CL_SUCCESS, retVal); - snprintf(expectedHint, DriverDiagnostics::maxHintStringSize, DriverDiagnostics::hintFormat[PRINTF_DETECTED_IN_KERNEL], kernel->getKernelInfo().name.c_str()); + snprintf(expectedHint, DriverDiagnostics::maxHintStringSize, DriverDiagnostics::hintFormat[PRINTF_DETECTED_IN_KERNEL], kernel->getKernelInfo().kernelDescriptor.kernelMetadata.kernelName.c_str()); EXPECT_TRUE(containsHint(expectedHint, userData)); } @@ -820,7 +820,7 @@ TEST_F(PerformanceHintEnqueueTest, GivenKernelWithCoherentPtrWhenEnqueueKernelIs EXPECT_EQ(CL_SUCCESS, retVal); - snprintf(expectedHint, DriverDiagnostics::maxHintStringSize, DriverDiagnostics::hintFormat[KERNEL_REQUIRES_COHERENCY], mockKernel.mockKernel->getKernelInfo().name.c_str()); + snprintf(expectedHint, DriverDiagnostics::maxHintStringSize, DriverDiagnostics::hintFormat[KERNEL_REQUIRES_COHERENCY], mockKernel.mockKernel->getKernelInfo().kernelDescriptor.kernelMetadata.kernelName.c_str()); EXPECT_TRUE(containsHint(expectedHint, userData)); delete buffer; } diff --git a/opencl/test/unit_test/context/driver_diagnostics_tests.cpp b/opencl/test/unit_test/context/driver_diagnostics_tests.cpp index fe7a5ffc24..dc9047a6a3 100644 --- a/opencl/test/unit_test/context/driver_diagnostics_tests.cpp +++ b/opencl/test/unit_test/context/driver_diagnostics_tests.cpp @@ -454,7 +454,7 @@ TEST_F(PerformanceHintTest, givenPrintDriverDiagnosticsDebugModeEnabledWhenCallF mockKernel.mockKernel->fillWithBuffersForAuxTranslation(memObjects); snprintf(expectedHint, DriverDiagnostics::maxHintStringSize, DriverDiagnostics::hintFormat[KERNEL_ARGUMENT_AUX_TRANSLATION], - mockKernel.mockKernel->getKernelInfo().name.c_str(), 0, mockKernel.mockKernel->getKernelInfo().kernelArgInfo.at(0).metadataExtended->argName.c_str()); + mockKernel.mockKernel->getKernelInfo().kernelDescriptor.kernelMetadata.kernelName.c_str(), 0, mockKernel.mockKernel->getKernelInfo().kernelArgInfo.at(0).metadataExtended->argName.c_str()); std::string output = testing::internal::GetCapturedStdout(); EXPECT_NE(0u, output.size()); @@ -719,7 +719,7 @@ TEST_P(PerformanceHintKernelTest, GivenSpillFillWhenKernelIsInitializedThenConte mockKernel.mockKernel->initialize(); snprintf(expectedHint, DriverDiagnostics::maxHintStringSize, DriverDiagnostics::hintFormat[REGISTER_PRESSURE_TOO_HIGH], - mockKernel.mockKernel->getKernelInfo().name.c_str(), size); + mockKernel.mockKernel->getKernelInfo().kernelDescriptor.kernelMetadata.kernelName.c_str(), size); EXPECT_EQ(!zeroSized, containsHint(expectedHint, userData)); } @@ -741,7 +741,7 @@ TEST_P(PerformanceHintKernelTest, GivenPrivateSurfaceWhenKernelIsInitializedThen mockKernel.mockKernel->initialize(); snprintf(expectedHint, DriverDiagnostics::maxHintStringSize, DriverDiagnostics::hintFormat[PRIVATE_MEMORY_USAGE_TOO_HIGH], - mockKernel.mockKernel->getKernelInfo().name.c_str(), size); + mockKernel.mockKernel->getKernelInfo().kernelDescriptor.kernelMetadata.kernelName.c_str(), size); EXPECT_EQ(!zeroSized, containsHint(expectedHint, userData)); } diff --git a/opencl/test/unit_test/execution_model/enqueue_execution_model_kernel_tests.cpp b/opencl/test/unit_test/execution_model/enqueue_execution_model_kernel_tests.cpp index afaed4646d..b37dae609e 100644 --- a/opencl/test/unit_test/execution_model/enqueue_execution_model_kernel_tests.cpp +++ b/opencl/test/unit_test/execution_model/enqueue_execution_model_kernel_tests.cpp @@ -73,7 +73,7 @@ HWCMDTEST_P(IGFX_GEN8_CORE, ParentKernelEnqueueTest, givenParentKernelWhenEnqueu pCmdQ->enqueueKernel(pKernel, 1, globalOffsets, workItems, workItems, 0, nullptr, nullptr); - if (pKernel->getKernelInfo().name == "kernel_reflection") { + if (pKernel->getKernelInfo().kernelDescriptor.kernelMetadata.kernelName == "kernel_reflection") { EXPECT_NE(0u, idData[0].getSamplerCount()); EXPECT_NE(0u, idData[0].getSamplerStatePointer()); } diff --git a/opencl/test/unit_test/fixtures/kernel_data_fixture.cpp b/opencl/test/unit_test/fixtures/kernel_data_fixture.cpp index be124c0b68..007e7ea5eb 100644 --- a/opencl/test/unit_test/fixtures/kernel_data_fixture.cpp +++ b/opencl/test/unit_test/fixtures/kernel_data_fixture.cpp @@ -98,7 +98,7 @@ void KernelDataTest::buildAndDecode() { pKernelInfo = program->Program::getKernelInfo(kernelName.c_str()); // validate name - EXPECT_STREQ(pKernelInfo->name.c_str(), kernelName.c_str()); + EXPECT_STREQ(pKernelInfo->kernelDescriptor.kernelMetadata.kernelName.c_str(), kernelName.c_str()); // validate each heap if (pKernelHeap != nullptr) { diff --git a/opencl/test/unit_test/kernel/kernel_reflection_surface_tests.cpp b/opencl/test/unit_test/kernel/kernel_reflection_surface_tests.cpp index daced862b7..5fb4770642 100644 --- a/opencl/test/unit_test/kernel/kernel_reflection_surface_tests.cpp +++ b/opencl/test/unit_test/kernel/kernel_reflection_surface_tests.cpp @@ -499,7 +499,7 @@ TEST_P(KernelReflectionSurfaceTest, WhenGettingCurbeParamsThenReturnedVectorIsSo uint32_t firstSSHTokenIndex = 0; MockKernel::ReflectionSurfaceHelperPublic::getCurbeParams(curbeParamsForBlock, tokenMask, firstSSHTokenIndex, *pBlockInfo, pDevice->getHardwareInfo()); - if (pBlockInfo->name.find("simple_block_kernel") == std::string::npos) { + if (pBlockInfo->kernelDescriptor.kernelMetadata.kernelName.find("simple_block_kernel") == std::string::npos) { EXPECT_LT(1u, curbeParamsForBlock.size()); } @@ -543,7 +543,7 @@ TEST_P(KernelReflectionSurfaceTest, WhenGettingCurbeParamsThenReturnedVectorHasE bool imageFound = false; bool samplerFound = false; - if (pBlockInfo->name.find("kernel_reflection_dispatch_0") != std::string::npos) { + if (pBlockInfo->kernelDescriptor.kernelMetadata.kernelName.find("kernel_reflection_dispatch_0") != std::string::npos) { EXPECT_LT(1u, curbeParamsForBlock.size()); for (const auto &curbeParams : curbeParamsForBlock) { @@ -587,7 +587,7 @@ TEST_P(KernelReflectionSurfaceTest, WhenGettingCurbeParamsThenTokenMaskIsCorrect uint32_t firstSSHTokenIndex = 0; MockKernel::ReflectionSurfaceHelperPublic::getCurbeParams(curbeParamsForBlock, tokenMask, firstSSHTokenIndex, *pBlockInfo, pDevice->getHardwareInfo()); - if (pBlockInfo->name.find("kernel_reflection_dispatch_0") != std::string::npos) { + if (pBlockInfo->kernelDescriptor.kernelMetadata.kernelName.find("kernel_reflection_dispatch_0") != std::string::npos) { EXPECT_LT(1u, curbeParamsForBlock.size()); const uint64_t bufferToken = (uint64_t)1 << 63; @@ -758,7 +758,7 @@ TEST_P(KernelReflectionSurfaceTest, WhenCreatingKernelReflectionSurfaceThenKerne size_t parentImageCount = 0; size_t parentSamplerCount = 0; - if (pKernel->getKernelInfo().name == "kernel_reflection") { + if (pKernel->getKernelInfo().kernelDescriptor.kernelMetadata.kernelName == "kernel_reflection") { parentImageCount = 1; parentSamplerCount = 1; } @@ -811,7 +811,7 @@ TEST_P(KernelReflectionSurfaceTest, WhenCreatingKernelReflectionSurfaceThenKerne uint32_t parentImages = 0; uint32_t parentSamplers = 0; - if (pKernel->getKernelInfo().name == "kernel_reflection") { + if (pKernel->getKernelInfo().kernelDescriptor.kernelMetadata.kernelName == "kernel_reflection") { parentImages = 1; parentSamplers = 1; EXPECT_LT(sizeof(IGIL_KernelDataHeader), pKernelHeader->m_ParentSamplerParamsOffset); @@ -1101,7 +1101,7 @@ HWCMDTEST_P(IGFX_GEN8_CORE, KernelReflectionSurfaceWithQueueTest, WhenObtainingK cl_sampler samplerCl = sampler.get(); cl_mem imageCl = image3d.get(); - if (pKernel->getKernelInfo().name == "kernel_reflection") { + if (pKernel->getKernelInfo().kernelDescriptor.kernelMetadata.kernelName == "kernel_reflection") { pKernel->setArgSampler(0, sizeof(cl_sampler), &samplerCl); pKernel->setArgImage(1, sizeof(cl_mem), &imageCl); } diff --git a/opencl/test/unit_test/program/kernel_info_from_patchtokens_tests.cpp b/opencl/test/unit_test/program/kernel_info_from_patchtokens_tests.cpp index abb0d9d08b..7f5cac6173 100644 --- a/opencl/test/unit_test/program/kernel_info_from_patchtokens_tests.cpp +++ b/opencl/test/unit_test/program/kernel_info_from_patchtokens_tests.cpp @@ -20,9 +20,9 @@ TEST(KernelInfoFromPatchTokens, GivenValidEmptyKernelFromPatchtokensThenReturnEm NEO::populateKernelInfo(dst, src, 4); NEO::KernelInfo expectedKernelInfo = {}; - expectedKernelInfo.name = std::string(src.name.begin()).c_str(); + expectedKernelInfo.kernelDescriptor.kernelMetadata.kernelName = std::string(src.name.begin()).c_str(); - EXPECT_STREQ(expectedKernelInfo.name.c_str(), dst.name.c_str()); + EXPECT_STREQ(expectedKernelInfo.kernelDescriptor.kernelMetadata.kernelName.c_str(), dst.kernelDescriptor.kernelMetadata.kernelName.c_str()); EXPECT_EQ(src.header->KernelHeapSize, dst.heapInfo.KernelHeapSize); EXPECT_EQ(src.header->GeneralStateHeapSize, dst.heapInfo.GeneralStateHeapSize); EXPECT_EQ(src.header->DynamicStateHeapSize, dst.heapInfo.DynamicStateHeapSize); diff --git a/opencl/test/unit_test/program/kernel_info_tests.cpp b/opencl/test/unit_test/program/kernel_info_tests.cpp index 9593ec8aed..9f5180f1bd 100644 --- a/opencl/test/unit_test/program/kernel_info_tests.cpp +++ b/opencl/test/unit_test/program/kernel_info_tests.cpp @@ -248,9 +248,9 @@ TEST_F(KernelInfoMultiRootDeviceTests, kernelAllocationHasCorrectRootDeviceIndex TEST(KernelInfo, whenGetKernelNamesStringIsCalledThenNamesAreProperlyConcatenated) { ExecutionEnvironment execEnv; KernelInfo kernel1 = {}; - kernel1.name = "kern1"; + kernel1.kernelDescriptor.kernelMetadata.kernelName = "kern1"; KernelInfo kernel2 = {}; - kernel2.name = "kern2"; + kernel2.kernelDescriptor.kernelMetadata.kernelName = "kern2"; std::vector kernelInfoArray; kernelInfoArray.push_back(&kernel1); kernelInfoArray.push_back(&kernel2); diff --git a/opencl/test/unit_test/program/process_debug_data_tests.cpp b/opencl/test/unit_test/program/process_debug_data_tests.cpp index d0bac3d6cd..cf7a37e38f 100644 --- a/opencl/test/unit_test/program/process_debug_data_tests.cpp +++ b/opencl/test/unit_test/program/process_debug_data_tests.cpp @@ -25,9 +25,9 @@ TEST_F(ProgramTests, GivenProgramWithDebugDataForTwoKernelsWhenPorcessedThenDebu std::unique_ptr debugData(new char[debugDataSize]); auto kernelInfo1 = new KernelInfo(); - kernelInfo1->name = kernelName1; + kernelInfo1->kernelDescriptor.kernelMetadata.kernelName = kernelName1; auto kernelInfo2 = new KernelInfo(); - kernelInfo2->name = kernelName2; + kernelInfo2->kernelDescriptor.kernelMetadata.kernelName = kernelName2; auto program = std::make_unique(toClDeviceVector(*pClDevice)); SProgramDebugDataHeaderIGC *programDebugHeader = reinterpret_cast(debugData.get()); @@ -83,7 +83,7 @@ TEST_F(ProgramTests, GivenProgramWithoutDebugDataWhenPorcessedThenDebugDataIsNot const char kernelName1[] = "kernel1"; auto kernelInfo1 = new KernelInfo(); - kernelInfo1->name = kernelName1; + kernelInfo1->kernelDescriptor.kernelMetadata.kernelName = kernelName1; auto program = std::make_unique(toClDeviceVector(*pClDevice)); program->addKernelInfo(kernelInfo1); diff --git a/opencl/test/unit_test/program/program_data_tests.cpp b/opencl/test/unit_test/program/program_data_tests.cpp index ed182d5399..c60adedd49 100644 --- a/opencl/test/unit_test/program/program_data_tests.cpp +++ b/opencl/test/unit_test/program/program_data_tests.cpp @@ -557,7 +557,7 @@ TEST(ProgramLinkBinaryTest, whenLinkerUnresolvedExternalThenLinkFailedAndBuildLo auto device = std::make_unique(MockDevice::createWithNewExecutionEnvironment(defaultHwInfo.get())); MockProgram program{nullptr, false, toClDeviceVector(*device)}; KernelInfo kernelInfo = {}; - kernelInfo.name = "onlyKernel"; + kernelInfo.kernelDescriptor.kernelMetadata.kernelName = "onlyKernel"; std::vector kernelHeap; kernelHeap.resize(32, 7); kernelInfo.heapInfo.pKernelHeap = kernelHeap.data(); @@ -574,7 +574,7 @@ TEST(ProgramLinkBinaryTest, whenLinkerUnresolvedExternalThenLinkFailedAndBuildLo EXPECT_FALSE(buildLog.empty()); Linker::UnresolvedExternals expectedUnresolvedExternals; expectedUnresolvedExternals.push_back(Linker::UnresolvedExternal{relocation, 0, false}); - auto expectedError = constructLinkerErrorMessage(expectedUnresolvedExternals, std::vector{"kernel : " + kernelInfo.name}); + auto expectedError = constructLinkerErrorMessage(expectedUnresolvedExternals, std::vector{"kernel : " + kernelInfo.kernelDescriptor.kernelMetadata.kernelName}); EXPECT_THAT(buildLog.c_str(), ::testing::HasSubstr(expectedError)); } @@ -594,7 +594,7 @@ TEST_F(ProgramDataTest, whenLinkerInputValidThenIsaIsProperlyPatched) { MockProgram program{nullptr, false, toClDeviceVector(*device)}; auto &buildInfo = program.buildInfos[device->getRootDeviceIndex()]; KernelInfo kernelInfo = {}; - kernelInfo.name = "onlyKernel"; + kernelInfo.kernelDescriptor.kernelMetadata.kernelName = "onlyKernel"; std::vector kernelHeap; kernelHeap.resize(32, 7); kernelInfo.heapInfo.pKernelHeap = kernelHeap.data(); @@ -644,7 +644,7 @@ TEST_F(ProgramDataTest, whenRelocationsAreNotNeededThenIsaIsPreserved) { MockProgram program{nullptr, false, toClDeviceVector(*device)}; auto &buildInfo = program.buildInfos[device->getRootDeviceIndex()]; KernelInfo kernelInfo = {}; - kernelInfo.name = "onlyKernel"; + kernelInfo.kernelDescriptor.kernelMetadata.kernelName = "onlyKernel"; std::vector kernelHeapData; kernelHeapData.resize(32, 7); std::vector kernelHeap(kernelHeapData.begin(), kernelHeapData.end()); diff --git a/opencl/test/unit_test/program/program_tests.cpp b/opencl/test/unit_test/program/program_tests.cpp index c85ea2fc48..c4abfb84c7 100644 --- a/opencl/test/unit_test/program/program_tests.cpp +++ b/opencl/test/unit_test/program/program_tests.cpp @@ -2501,11 +2501,11 @@ TEST_F(ProgramTests, givenSeparateBlockKernelsWhenRegularKernelsThenSeparateNone MockProgram program(pContext, false, toClDeviceVector(*pClDevice)); auto pRegularKernel1Info = new KernelInfo(); - pRegularKernel1Info->name = "regular_kernel_1"; + pRegularKernel1Info->kernelDescriptor.kernelMetadata.kernelName = "regular_kernel_1"; program.getKernelInfoArray().push_back(pRegularKernel1Info); auto pRegularKernel2Info = new KernelInfo(); - pRegularKernel2Info->name = "regular_kernel_2"; + pRegularKernel2Info->kernelDescriptor.kernelMetadata.kernelName = "regular_kernel_2"; program.getKernelInfoArray().push_back(pRegularKernel2Info); EXPECT_EQ(2u, program.getKernelInfoArray().size()); @@ -2513,8 +2513,8 @@ TEST_F(ProgramTests, givenSeparateBlockKernelsWhenRegularKernelsThenSeparateNone program.separateBlockKernels(); EXPECT_EQ(2u, program.getKernelInfoArray().size()); - EXPECT_EQ(0, strcmp("regular_kernel_1", program.getKernelInfoArray().at(0)->name.c_str())); - EXPECT_EQ(0, strcmp("regular_kernel_2", program.getKernelInfoArray().at(1)->name.c_str())); + EXPECT_EQ(0, strcmp("regular_kernel_1", program.getKernelInfoArray().at(0)->kernelDescriptor.kernelMetadata.kernelName.c_str())); + EXPECT_EQ(0, strcmp("regular_kernel_2", program.getKernelInfoArray().at(1)->kernelDescriptor.kernelMetadata.kernelName.c_str())); EXPECT_EQ(0u, program.getBlockKernelManager()->getCount()); } @@ -2523,12 +2523,12 @@ TEST_F(ProgramTests, givenSeparateBlockKernelsWhenChildLikeKernelWithoutParentKe MockProgram program(pContext, false, toClDeviceVector(*pClDevice)); auto pParentKernelInfo = new KernelInfo(); - pParentKernelInfo->name = "another_parent_kernel"; + pParentKernelInfo->kernelDescriptor.kernelMetadata.kernelName = "another_parent_kernel"; program.getKernelInfoArray().push_back(pParentKernelInfo); program.getParentKernelInfoArray().push_back(pParentKernelInfo); auto pChildKernelInfo = new KernelInfo(); - pChildKernelInfo->name = "childlike_kernel_dispatch_0"; + pChildKernelInfo->kernelDescriptor.kernelMetadata.kernelName = "childlike_kernel_dispatch_0"; program.getKernelInfoArray().push_back(pChildKernelInfo); EXPECT_EQ(2u, program.getKernelInfoArray().size()); @@ -2537,8 +2537,8 @@ TEST_F(ProgramTests, givenSeparateBlockKernelsWhenChildLikeKernelWithoutParentKe program.separateBlockKernels(); EXPECT_EQ(2u, program.getKernelInfoArray().size()); - EXPECT_EQ(0, strcmp("another_parent_kernel", program.getKernelInfoArray().at(0)->name.c_str())); - EXPECT_EQ(0, strcmp("childlike_kernel_dispatch_0", program.getKernelInfoArray().at(1)->name.c_str())); + EXPECT_EQ(0, strcmp("another_parent_kernel", program.getKernelInfoArray().at(0)->kernelDescriptor.kernelMetadata.kernelName.c_str())); + EXPECT_EQ(0, strcmp("childlike_kernel_dispatch_0", program.getKernelInfoArray().at(1)->kernelDescriptor.kernelMetadata.kernelName.c_str())); EXPECT_EQ(0u, program.getBlockKernelManager()->getCount()); } @@ -2547,12 +2547,12 @@ TEST_F(ProgramTests, givenSeparateBlockKernelsWhenChildLikeKernelWithoutSubgroup MockProgram program(pContext, false, toClDeviceVector(*pClDevice)); auto pSubgroupKernelInfo = new KernelInfo(); - pSubgroupKernelInfo->name = "another_subgroup_kernel"; + pSubgroupKernelInfo->kernelDescriptor.kernelMetadata.kernelName = "another_subgroup_kernel"; program.getKernelInfoArray().push_back(pSubgroupKernelInfo); program.getSubgroupKernelInfoArray().push_back(pSubgroupKernelInfo); auto pChildKernelInfo = new KernelInfo(); - pChildKernelInfo->name = "childlike_kernel_dispatch_0"; + pChildKernelInfo->kernelDescriptor.kernelMetadata.kernelName = "childlike_kernel_dispatch_0"; program.getKernelInfoArray().push_back(pChildKernelInfo); EXPECT_EQ(2u, program.getKernelInfoArray().size()); @@ -2561,8 +2561,8 @@ TEST_F(ProgramTests, givenSeparateBlockKernelsWhenChildLikeKernelWithoutSubgroup program.separateBlockKernels(); EXPECT_EQ(2u, program.getKernelInfoArray().size()); - EXPECT_EQ(0, strcmp("another_subgroup_kernel", program.getKernelInfoArray().at(0)->name.c_str())); - EXPECT_EQ(0, strcmp("childlike_kernel_dispatch_0", program.getKernelInfoArray().at(1)->name.c_str())); + EXPECT_EQ(0, strcmp("another_subgroup_kernel", program.getKernelInfoArray().at(0)->kernelDescriptor.kernelMetadata.kernelName.c_str())); + EXPECT_EQ(0, strcmp("childlike_kernel_dispatch_0", program.getKernelInfoArray().at(1)->kernelDescriptor.kernelMetadata.kernelName.c_str())); EXPECT_EQ(0u, program.getBlockKernelManager()->getCount()); } @@ -2571,12 +2571,12 @@ TEST_F(ProgramTests, givenSeparateBlockKernelsWhenParentKernelWithChildKernelThe MockProgram program(pContext, false, toClDeviceVector(*pClDevice)); auto pParentKernelInfo = new KernelInfo(); - pParentKernelInfo->name = "parent_kernel"; + pParentKernelInfo->kernelDescriptor.kernelMetadata.kernelName = "parent_kernel"; program.getKernelInfoArray().push_back(pParentKernelInfo); program.getParentKernelInfoArray().push_back(pParentKernelInfo); auto pChildKernelInfo = new KernelInfo(); - pChildKernelInfo->name = "parent_kernel_dispatch_0"; + pChildKernelInfo->kernelDescriptor.kernelMetadata.kernelName = "parent_kernel_dispatch_0"; program.getKernelInfoArray().push_back(pChildKernelInfo); EXPECT_EQ(2u, program.getKernelInfoArray().size()); @@ -2585,22 +2585,22 @@ TEST_F(ProgramTests, givenSeparateBlockKernelsWhenParentKernelWithChildKernelThe program.separateBlockKernels(); EXPECT_EQ(1u, program.getKernelInfoArray().size()); - EXPECT_EQ(0, strcmp("parent_kernel", program.getKernelInfoArray().at(0)->name.c_str())); + EXPECT_EQ(0, strcmp("parent_kernel", program.getKernelInfoArray().at(0)->kernelDescriptor.kernelMetadata.kernelName.c_str())); EXPECT_EQ(1u, program.getBlockKernelManager()->getCount()); - EXPECT_EQ(0, strcmp("parent_kernel_dispatch_0", program.getBlockKernelManager()->getBlockKernelInfo(0)->name.c_str())); + EXPECT_EQ(0, strcmp("parent_kernel_dispatch_0", program.getBlockKernelManager()->getBlockKernelInfo(0)->kernelDescriptor.kernelMetadata.kernelName.c_str())); } TEST_F(ProgramTests, givenSeparateBlockKernelsWhenSubgroupKernelWithChildKernelThenSeparateChildKernel) { MockProgram program(pContext, false, toClDeviceVector(*pClDevice)); auto pSubgroupKernelInfo = new KernelInfo(); - pSubgroupKernelInfo->name = "subgroup_kernel"; + pSubgroupKernelInfo->kernelDescriptor.kernelMetadata.kernelName = "subgroup_kernel"; program.getKernelInfoArray().push_back(pSubgroupKernelInfo); program.getSubgroupKernelInfoArray().push_back(pSubgroupKernelInfo); auto pChildKernelInfo = new KernelInfo(); - pChildKernelInfo->name = "subgroup_kernel_dispatch_0"; + pChildKernelInfo->kernelDescriptor.kernelMetadata.kernelName = "subgroup_kernel_dispatch_0"; program.getKernelInfoArray().push_back(pChildKernelInfo); EXPECT_EQ(2u, program.getKernelInfoArray().size()); @@ -2609,10 +2609,10 @@ TEST_F(ProgramTests, givenSeparateBlockKernelsWhenSubgroupKernelWithChildKernelT program.separateBlockKernels(); EXPECT_EQ(1u, program.getKernelInfoArray().size()); - EXPECT_EQ(0, strcmp("subgroup_kernel", program.getKernelInfoArray().at(0)->name.c_str())); + EXPECT_EQ(0, strcmp("subgroup_kernel", program.getKernelInfoArray().at(0)->kernelDescriptor.kernelMetadata.kernelName.c_str())); EXPECT_EQ(1u, program.getBlockKernelManager()->getCount()); - EXPECT_EQ(0, strcmp("subgroup_kernel_dispatch_0", program.getBlockKernelManager()->getBlockKernelInfo(0)->name.c_str())); + EXPECT_EQ(0, strcmp("subgroup_kernel_dispatch_0", program.getBlockKernelManager()->getBlockKernelInfo(0)->kernelDescriptor.kernelMetadata.kernelName.c_str())); } TEST(ProgramDestructionTests, givenProgramUsingDeviceWhenItIsDestroyedAfterPlatfromCleanupThenItIsCleanedUpProperly) { diff --git a/opencl/test/unit_test/program/program_with_block_kernels_tests.cpp b/opencl/test/unit_test/program/program_with_block_kernels_tests.cpp index fbdac6dd95..224cbb3da8 100644 --- a/opencl/test/unit_test/program/program_with_block_kernels_tests.cpp +++ b/opencl/test/unit_test/program/program_with_block_kernels_tests.cpp @@ -81,7 +81,7 @@ TEST_F(ProgramWithBlockKernelsTest, GivenKernelWithBlockKernelsWhenProgramIsBuil bool blockKernelFound = false; for (size_t i = 0; i < mockProgram->blockKernelManager->getCount(); i++) { - if (blockKernelInfos[i]->name.find("simple_block_kernel_dispatch") != std::string::npos) { + if (blockKernelInfos[i]->kernelDescriptor.kernelMetadata.kernelName.find("simple_block_kernel_dispatch") != std::string::npos) { blockKernelFound = true; break; } @@ -117,7 +117,7 @@ TEST_F(ProgramWithBlockKernelsTest, GivenKernelWithBlockKernelsWhenProgramIsLink for (uint32_t i = 0; i < blockManager->getCount(); i++) { const KernelInfo *info = blockManager->getBlockKernelInfo(i); - if (info->name.find("simple_block_kernel_dispatch") != std::string::npos) { + if (info->kernelDescriptor.kernelMetadata.kernelName.find("simple_block_kernel_dispatch") != std::string::npos) { break; } } diff --git a/opencl/test/unit_test/source_level_debugger/source_level_debugger_tests.cpp b/opencl/test/unit_test/source_level_debugger/source_level_debugger_tests.cpp index fa01d19a0b..a009e73d59 100644 --- a/opencl/test/unit_test/source_level_debugger/source_level_debugger_tests.cpp +++ b/opencl/test/unit_test/source_level_debugger/source_level_debugger_tests.cpp @@ -301,12 +301,12 @@ TEST(SourceLevelDebugger, givenKernelDebuggerLibraryActiveWhenNotifyKernelDebugD info.debugData.genIsaSize = sizeof(dbgIsa); info.debugData.vIsaSize = sizeof(visa); - info.name = "debugKernel"; + info.kernelDescriptor.kernelMetadata.kernelName = "debugKernel"; info.heapInfo.KernelHeapSize = sizeof(isa); info.heapInfo.pKernelHeap = isa; - debugger.notifyKernelDebugData(&info.debugData, info.name, info.heapInfo.pKernelHeap, info.heapInfo.KernelHeapSize); + debugger.notifyKernelDebugData(&info.debugData, info.kernelDescriptor.kernelMetadata.kernelName, info.heapInfo.pKernelHeap, info.heapInfo.KernelHeapSize); EXPECT_TRUE(interceptor.kernelDebugDataCalled); @@ -321,7 +321,7 @@ TEST(SourceLevelDebugger, givenKernelDebuggerLibraryActiveWhenNotifyKernelDebugD EXPECT_EQ(info.heapInfo.KernelHeapSize, interceptor.kernelDebugDataArgIn.KernelBinSize); EXPECT_EQ(isa, interceptor.kernelDebugDataArgIn.kernelBinBuffer); - EXPECT_STREQ(info.name.c_str(), interceptor.kernelDebugDataArgIn.kernelName); + EXPECT_STREQ(info.kernelDescriptor.kernelMetadata.kernelName.c_str(), interceptor.kernelDebugDataArgIn.kernelName); } TEST(SourceLevelDebugger, givenNoVisaWhenNotifyKernelDebugDataIsCalledThenDebuggerLibraryFunctionIsNotCalled) { @@ -342,12 +342,12 @@ TEST(SourceLevelDebugger, givenNoVisaWhenNotifyKernelDebugDataIsCalledThenDebugg info.debugData.genIsaSize = sizeof(dbgIsa); info.debugData.vIsaSize = 0; - info.name = "debugKernel"; + info.kernelDescriptor.kernelMetadata.kernelName = "debugKernel"; info.heapInfo.KernelHeapSize = sizeof(isa); info.heapInfo.pKernelHeap = isa; - debugger.notifyKernelDebugData(&info.debugData, info.name, info.heapInfo.pKernelHeap, info.heapInfo.KernelHeapSize); + debugger.notifyKernelDebugData(&info.debugData, info.kernelDescriptor.kernelMetadata.kernelName, info.heapInfo.pKernelHeap, info.heapInfo.KernelHeapSize); EXPECT_FALSE(interceptor.kernelDebugDataCalled); } @@ -369,12 +369,12 @@ TEST(SourceLevelDebugger, givenNoGenIsaWhenNotifyKernelDebugDataIsCalledThenDebu info.debugData.genIsaSize = 0; info.debugData.vIsaSize = sizeof(visa); - info.name = "debugKernel"; + info.kernelDescriptor.kernelMetadata.kernelName = "debugKernel"; info.heapInfo.KernelHeapSize = sizeof(isa); info.heapInfo.pKernelHeap = isa; - debugger.notifyKernelDebugData(&info.debugData, info.name, isa, sizeof(isa)); + debugger.notifyKernelDebugData(&info.debugData, info.kernelDescriptor.kernelMetadata.kernelName, isa, sizeof(isa)); EXPECT_FALSE(interceptor.kernelDebugDataCalled); } @@ -390,7 +390,7 @@ TEST(SourceLevelDebugger, givenKernelDebuggerLibraryNotActiveWhenNotifyKernelDeb debugger.setActive(false); KernelInfo info; - debugger.notifyKernelDebugData(&info.debugData, info.name, nullptr, 0); + debugger.notifyKernelDebugData(&info.debugData, info.kernelDescriptor.kernelMetadata.kernelName, nullptr, 0); EXPECT_FALSE(interceptor.kernelDebugDataCalled); }