diff --git a/shared/test/unit_test/device_binary_format/zebin_decoder_tests.cpp b/shared/test/unit_test/device_binary_format/zebin_decoder_tests.cpp index 44197c0a6f..5cfb3849e2 100644 --- a/shared/test/unit_test/device_binary_format/zebin_decoder_tests.cpp +++ b/shared/test/unit_test/device_binary_format/zebin_decoder_tests.cpp @@ -618,22 +618,22 @@ version: '100' TEST(ExtractZeInfoKernelSections, GivenKnownSectionsThenCapturesThemProperly) { NEO::ConstStringRef yaml = R"===(--- -kernels: +kernels: - name: some_kernel - execution_env: + execution_env: grf_count: 128 simd_size: 32 debug_env: sip_surface_bti: 0 - payload_arguments: + payload_arguments: - arg_type: global_id_offset offset: 0 size: 12 - per_thread_payload_arguments: + per_thread_payload_arguments: - arg_type: local_id offset: 0 size: 192 - binding_table_indices: + binding_table_indices: - bti_value: 0 arg_index: 0 per_thread_memory_buffers: @@ -1168,9 +1168,9 @@ kernels: TEST(ExtractZeInfoKernelSections, GivenUnknownSectionThenEmitsAnError) { NEO::ConstStringRef yaml = R"===(--- -kernels: +kernels: - name: some_kernel - apple : + apple : - red - green ... @@ -1906,9 +1906,9 @@ kernels: } TEST(ReadZeInfoExecutionEnvironment, GivenValidYamlEntriesThenSetProperMembers) { NEO::ConstStringRef yaml = R"===(--- -kernels: +kernels: - name: some_kernel - execution_env: + execution_env: barrier_count : 7 disable_mid_thread_preemption : true grf_count : 13 @@ -1985,9 +1985,9 @@ kernels: TEST(ReadZeInfoExecutionEnvironment, GivenUnknownEntryThenEmitsError) { NEO::ConstStringRef yaml = R"===(--- -kernels: +kernels: - name: some_kernel - execution_env: + execution_env: simd_size : 8 something_new : 36 ... @@ -2011,7 +2011,7 @@ kernels: TEST(ReadZeInfoExecutionEnvironment, GivenActualKernelStartOffsetThenDontTreatItAsInvalidEntry) { NEO::ConstStringRef yaml = R"===(--- -kernels: +kernels: - name: some_kernel execution_env: simd_size : 8 @@ -2036,9 +2036,9 @@ kernels: TEST(ReadZeInfoExecutionEnvironment, GivenInvalidValueForKnownEntryThenFails) { NEO::ConstStringRef yaml = R"===(--- -kernels: +kernels: - name: some_kernel - execution_env: + execution_env: simd_size : true ... )==="; @@ -2060,9 +2060,9 @@ kernels: TEST(ReadZeInfoExecutionEnvironment, GivenInvalidLengthForKnownCollectionEntryThenFails) { NEO::ConstStringRef yaml = R"===(--- -kernels: +kernels: - name: some_kernel - execution_env: + execution_env: required_work_group_size: [5, 2] ... )==="; @@ -2084,7 +2084,7 @@ kernels: TEST(ReadZeInfoAttributes, GivenValidYamlEntriesThenSetProperMembers) { NEO::ConstStringRef yaml = R"===(--- -kernels: +kernels: - name: some_kernel user_attributes: intel_reqd_sub_group_size: 16 @@ -2129,7 +2129,7 @@ kernels: TEST(ReadZeInfoDebugEnvironment, givenSipSurfaceBtiEntryThenSetProperMembers) { NEO::ConstStringRef yaml = R"===(--- -kernels: +kernels: - name: some_kernel debug_env: sip_surface_bti: 0 @@ -2155,7 +2155,7 @@ kernels: TEST(ReadZeInfoDebugEnvironment, givenSipSurfaceOffsetEntryThenSetProperMembers) { NEO::ConstStringRef yaml = R"===(--- -kernels: +kernels: - name: some_kernel debug_env: sip_surface_offset: 0 @@ -2181,7 +2181,7 @@ kernels: TEST(ReadZeInfoDebugEnvironment, givenUnknownEntryThenEmitsError) { NEO::ConstStringRef yaml = R"===(--- -kernels: +kernels: - name: some_kernel debug_env: sip_surface_bti: 0 @@ -2206,7 +2206,7 @@ kernels: TEST(ReadZeInfoDebugEnvironment, givenInvalidValueForKnownEntryThenFail) { NEO::ConstStringRef yaml = R"===(--- -kernels: +kernels: - name: some_kernel debug_env: sip_surface_bti: any @@ -2232,7 +2232,7 @@ TEST_F(decodeZeInfoKernelEntryTest, givenValidDebugEnvironmentWithInvalidSipSurf ConstStringRef zeinfo = R"===( kernels: - name : some_kernel - execution_env: + execution_env: simd_size: 8 debug_env: sip_surface_bti: 123 @@ -2252,7 +2252,7 @@ TEST_F(decodeZeInfoKernelEntryTest, givenValidDebugEnvironmentWithSIPSurfaceBTIS ConstStringRef zeinfo = R"===( kernels: - name : some_kernel - execution_env: + execution_env: simd_size: 8 debug_env: sip_surface_bti: 0 @@ -2358,7 +2358,7 @@ kernels: TEST_F(decodeZeInfoKernelEntryTest, GivenKernelAttributesWhenPopulatingKernelDescriptorThenKernelLanguageSourcesAreSetAccordingly) { ConstStringRef zeinfo = R"===(--- -kernels: +kernels: - name: some_kernel execution_env: simd_size: 8 @@ -2407,7 +2407,7 @@ TEST(PopulateKernelSourceAttributes, GivenRequiredWalkOrderAttributeWhenPopulati TEST_F(decodeZeInfoKernelEntryTest, GivenUnknownAttributeWhenPopulatingKernelDescriptorThenErrorIsReturned) { ConstStringRef zeinfo = R"===(--- -kernels: +kernels: - name: some_kernel execution_env: simd_size: 8 @@ -2446,9 +2446,9 @@ TEST(ReadEnumChecked, GivenInvalidEnumStringThenReturnErrorAndFail) { TEST(ReadZeInfoPerThreadPayloadArguments, GivenValidYamlEntriesThenSetProperMembers) { NEO::ConstStringRef yaml = R"===(--- -kernels: +kernels: - name: some_kernel - per_thread_payload_arguments: + per_thread_payload_arguments: - arg_type : packed_local_ids offset : 8 size : 16 @@ -2483,9 +2483,9 @@ kernels: TEST(ReadZeInfoPerThreadPayloadArguments, GivenUnknownEntryThenEmitsError) { NEO::ConstStringRef yaml = R"===(--- -kernels: +kernels: - name: some_kernel - per_thread_payload_arguments: + per_thread_payload_arguments: - arg_type : packed_local_ids offset : 8 size : 16 @@ -2511,9 +2511,9 @@ kernels: TEST(ReadZeInfoPerThreadPayloadArguments, GivenInvalidValueForKnownEntryThenFails) { NEO::ConstStringRef yaml = R"===(--- -kernels: +kernels: - name: some_kernel - per_thread_payload_arguments: + per_thread_payload_arguments: - arg_type : packed_local_ids offset : true size : 16 @@ -2537,9 +2537,9 @@ kernels: TEST(ReadZeInfoPerThreadPayloadArguments, GivenZeroSizeEntryThenSkipsItAndEmitsWarning) { NEO::ConstStringRef yaml = R"===(--- -kernels: +kernels: - name: some_kernel - per_thread_payload_arguments: + per_thread_payload_arguments: - arg_type : packed_local_ids offset : 16 size : 0 @@ -2564,12 +2564,12 @@ kernels: TEST(ReadZeInfoPayloadArguments, GivenValidYamlEntriesThenSetProperMembers) { NEO::ConstStringRef yaml = R"===(--- -kernels: +kernels: - name: some_kernel - payload_arguments: + payload_arguments: - arg_type : arg_bypointer offset : 16 - size : 8 + size : 8 arg_index : 1 addrmode : stateless addrspace : global @@ -2634,9 +2634,9 @@ kernels: TEST(ReadZeInfoPayloadArguments, GivenUnknownEntryThenEmitsError) { NEO::ConstStringRef yaml = R"===(--- -kernels: +kernels: - name: some_kernel - payload_arguments: + payload_arguments: - arg_type : arg_byvalue offset : 24 size : 4 @@ -2703,9 +2703,9 @@ kernels: TEST(ReadZeInfoBindingTableIndices, GivenInvalidValueForKnownEntryThenFails) { NEO::ConstStringRef yaml = R"===(--- -kernels: +kernels: - name: some_kernel - payload_arguments: + payload_arguments: - arg_type : arg_byvalue offset : 24 size : true @@ -2731,9 +2731,9 @@ kernels: TEST(ReadZeInfoBindingTableIndices, GivenValidYamlEntriesThenSetProperMembers) { NEO::ConstStringRef yaml = R"===(--- -kernels: +kernels: - name: some_kernel - binding_table_indices: + binding_table_indices: - bti_value : 1 arg_index : 7 - bti_value : 5 @@ -2765,9 +2765,9 @@ kernels: TEST(ReadZeInfoBindingTableIndices, GivenUnknownEntryThenEmitsError) { NEO::ConstStringRef yaml = R"===(--- -kernels: +kernels: - name: some_kernel - binding_table_indices: + binding_table_indices: - bti_value : 1 arg_index : 7 something_new : true @@ -2795,9 +2795,9 @@ kernels: TEST(ReadZeInfoPayloadArguments, GivenInvalidValueForKnownEntryThenFails) { NEO::ConstStringRef yaml = R"===(--- -kernels: +kernels: - name: some_kernel - binding_table_indices: + binding_table_indices: - bti_value : 1 arg_index : any ... @@ -2820,9 +2820,9 @@ kernels: TEST(ReadZeInfoPerThreadMemoryBuffers, GivenValidYamlEntriesThenSetProperMembers) { NEO::ConstStringRef yaml = R"===(--- -kernels: +kernels: - name: some_kernel - per_thread_memory_buffers: + per_thread_memory_buffers: - type: scratch usage: single_space size: 64 @@ -2871,11 +2871,11 @@ kernels: TEST(ReadZeInfoPerThreadMemoryBuffers, GivenPerSimtThreadPrivateMemoryThenSetsProperFlag) { NEO::ConstStringRef yaml = R"===(--- -kernels: +kernels: - name: some_kernel - execution_env: + execution_env: simd_size: 16 - per_thread_memory_buffers: + per_thread_memory_buffers: - type: global usage: private_space size: 128 @@ -2906,9 +2906,9 @@ kernels: TEST(ReadZeInfoPerThreadMemoryBuffers, GivenUnknownEntryThenEmmitsError) { NEO::ConstStringRef yaml = R"===(--- -kernels: +kernels: - name: some_kernel - per_thread_memory_buffers: + per_thread_memory_buffers: - type: scratch usage: single_space size: 64 @@ -2938,9 +2938,9 @@ kernels: TEST(ReadZeInfoPerThreadMemoryBuffers, GivenInvalidValueForKnownEntryThenFails) { NEO::ConstStringRef yaml = R"===(--- -kernels: +kernels: - name: some_kernel - per_thread_memory_buffers: + per_thread_memory_buffers: - type: scratch usage: single_space size: eight @@ -3468,7 +3468,7 @@ TEST(DecodeSingleDeviceBinaryZebin, WhenDecodeZeInfoFailsThenDecodingFails) { auto &gfxCoreHelper = mockExecutionEnvironment.rootDeviceEnvironments[0]->getHelper(); std::string brokenZeInfo = "version : \'" + versionToString(Zebin::ZeInfo::zeInfoDecoderVersion) + R"===(' kernels: - - + - )==="; ZebinTestData::ValidEmptyProgram zebin; zebin.removeSection(NEO::Zebin::Elf::SectionHeaderTypeZebin::SHT_ZEBIN_ZEINFO, NEO::Zebin::Elf::SectionNames::zeInfo); @@ -3617,7 +3617,7 @@ functions: - name: fun execution_env: grf_count: 128 - simd_size: 8 + simd_size: 8 )==="; ZebinTestData::ValidEmptyProgram zebin; @@ -3681,7 +3681,7 @@ TEST_F(decodeZeInfoKernelEntryTest, GivenMinimalExecutionEnvThenPopulateKernelDe ConstStringRef zeinfo = R"===( kernels: - name : some_kernel - execution_env: + execution_env: simd_size: 32 grf_count: 128 )==="; @@ -3747,10 +3747,10 @@ TEST_F(decodeZeInfoKernelEntryTest, GivenInvalidPerThreadPayloadArgYamlEntriesTh ConstStringRef zeinfo = R"===( kernels: - name : some_kernel - execution_env: + execution_env: grf_count: 128 simd_size: 32 - per_thread_payload_arguments: + per_thread_payload_arguments: - arg_type: local_id offset: aaa size: 8 @@ -3765,10 +3765,10 @@ TEST_F(decodeZeInfoKernelEntryTest, GivenInvalidPayloadArgYamlEntriesThenFails) ConstStringRef zeinfo = R"===( kernels: - name : some_kernel - execution_env: + execution_env: grf_count: 128 simd_size: 32 - payload_arguments: + payload_arguments: - arg_type: global_id_offset offset: aaa size: 12 @@ -3783,10 +3783,10 @@ TEST_F(decodeZeInfoKernelEntryTest, GivenInvalidPerThreadMemoryBufferYamlEntries ConstStringRef zeinfo = R"===( kernels: - name : some_kernel - execution_env: + execution_env: grf_count: 128 simd_size: 32 - per_thread_memory_buffers: + per_thread_memory_buffers: - type: scratch usage: spill_fill_space size: eight @@ -3801,7 +3801,7 @@ TEST_F(decodeZeInfoKernelEntryTest, GivenInvalidSimdSizeThenFails) { ConstStringRef zeinfo = R"===( kernels: - name : some_kernel - execution_env: + execution_env: simd_size: 7 )==="; auto err = decodeZeInfoKernelEntry(zeinfo); @@ -3816,7 +3816,7 @@ TEST_F(decodeZeInfoKernelEntryTest, GivenValidSimdSizeThenSetsItCorrectly) { std::string zeinfo = R"===( kernels: - name : some_kernel - execution_env: + execution_env: simd_size: )===" + std::to_string(simdSize) + "\n"; auto err = decodeZeInfoKernelEntry(zeinfo); @@ -3855,7 +3855,7 @@ TEST_F(decodeZeInfoKernelEntryTest, GivenValidThreadSchedulingModesThenPopulateC std::string zeinfo = R"===( kernels: - name: some_kernel - execution_env: + execution_env: simd_size: 32 thread_scheduling_mode: )===" + str.str() + @@ -3874,9 +3874,9 @@ TEST_F(decodeZeInfoKernelEntryTest, GivenValidLocalIdThenAlignUpChannelSizeToGrf ConstStringRef zeinfo = R"===( kernels: - name : some_kernel - execution_env: + execution_env: simd_size: 16 - per_thread_payload_arguments: + per_thread_payload_arguments: - arg_type: local_id offset: 0 size: 192 @@ -3894,9 +3894,9 @@ TEST_F(decodeZeInfoKernelEntryTest, GivenValidPerThreadArgThenPopulatesKernelDes ConstStringRef zeinfo = R"===( kernels: - name : some_kernel - execution_env: + execution_env: simd_size: 32 - per_thread_payload_arguments: + per_thread_payload_arguments: - arg_type: local_id offset: 0 size: 192 @@ -3912,9 +3912,9 @@ TEST_F(decodeZeInfoKernelEntryTest, GivenInvalidPayloadArgThenFails) { ConstStringRef zeinfo = R"===( kernels: - name : some_kernel - execution_env: + execution_env: simd_size: 8 - payload_arguments: + payload_arguments: - arg_type: local_id offset: 0 size: 12 @@ -3932,9 +3932,9 @@ TEST_F(decodeZeInfoKernelEntryTest, GivenZebinAppendElwsThenInjectsElwsArg) { ConstStringRef zeinfo = R"===( kernels: - name : some_kernel - execution_env: + execution_env: simd_size: 8 - payload_arguments: + payload_arguments: - arg_type: local_size offset: 16 size: 12 @@ -3957,9 +3957,9 @@ TEST_F(decodeZeInfoKernelEntryTest, GivenInvalidBindingTableYamlEntriesThenFails ConstStringRef zeinfo = R"===( kernels: - name : some_kernel - execution_env: + execution_env: simd_size: 8 - payload_arguments: + payload_arguments: - arg_type: arg_byvalue offset: 0 size: 12 @@ -3978,9 +3978,9 @@ TEST_F(decodeZeInfoKernelEntryTest, GivenValidBindingTableEntriesThenGeneratesSs ConstStringRef zeinfo = R"===( kernels: - name : some_kernel - execution_env: + execution_env: simd_size: 8 - payload_arguments: + payload_arguments: - arg_type: arg_bypointer offset: 0 size: 8 @@ -4017,9 +4017,9 @@ TEST_F(decodeZeInfoKernelEntryTest, GivenBtiEntryForWrongArgTypeThenFail) { ConstStringRef zeinfo = R"===( kernels: - name : some_kernel - execution_env: + execution_env: simd_size: 8 - payload_arguments: + payload_arguments: - arg_type: arg_byvalue offset: 0 size: 12 @@ -4038,9 +4038,9 @@ TEST_F(decodeZeInfoKernelEntryTest, GivenValidArgSamplerThenGeneratesDsh) { ConstStringRef zeinfo = R"===( kernels: - name : some_kernel - execution_env: + execution_env: simd_size: 8 - payload_arguments: + payload_arguments: - arg_type: arg_bypointer size: 8 addrspace: sampler @@ -4071,11 +4071,11 @@ kernels: TEST_F(decodeZeInfoKernelEntryTest, GivenPerThreadMemoryBufferWhenTypeIsGlobalAndUsageIsNotPrivateThenFails) { { ConstStringRef zeinfo = R"===( - kernels: + kernels: - name : some_kernel - execution_env: + execution_env: simd_size: 8 - per_thread_memory_buffers: + per_thread_memory_buffers: - type: global usage: spill_fill_space size: 64 @@ -4089,11 +4089,11 @@ TEST_F(decodeZeInfoKernelEntryTest, GivenPerThreadMemoryBufferWhenTypeIsGlobalAn { ConstStringRef zeinfo = R"===( - kernels: + kernels: - name : some_kernel - execution_env: + execution_env: simd_size: 8 - per_thread_memory_buffers: + per_thread_memory_buffers: - type: global usage: single_space size: 64 @@ -4108,11 +4108,11 @@ TEST_F(decodeZeInfoKernelEntryTest, GivenPerThreadMemoryBufferWhenTypeIsGlobalAn TEST_F(decodeZeInfoKernelEntryTest, GivenPerThreadMemoryBufferWhenTypeIsSlmThenFails) { ConstStringRef zeinfo = R"===( - kernels: + kernels: - name : some_kernel - execution_env: + execution_env: simd_size: 8 - per_thread_memory_buffers: + per_thread_memory_buffers: - type: slm usage: spill_fill_space size: 64 @@ -4126,11 +4126,11 @@ TEST_F(decodeZeInfoKernelEntryTest, GivenPerThreadMemoryBufferWhenTypeIsSlmThenF TEST_F(decodeZeInfoKernelEntryTest, GivenPerThreadMemoryBufferWhenTypeIsGlobalAndUsageIsPrivateThenSetsProperFieldsInDescriptor) { ConstStringRef zeinfo = R"===( -kernels: +kernels: - name : some_kernel - execution_env: + execution_env: simd_size: 8 - per_thread_memory_buffers: + per_thread_memory_buffers: - type: global usage: private_space size: 256 @@ -4144,11 +4144,11 @@ kernels: TEST_F(decodeZeInfoKernelEntryTest, givenPerSimtThreadBufferWhenPopulatingThenCalculatesCorrectSize) { ConstStringRef zeinfo = R"===( -kernels: +kernels: - name : some_kernel - execution_env: + execution_env: simd_size: 8 - per_thread_memory_buffers: + per_thread_memory_buffers: - type: global usage: private_space size: 256 @@ -4163,12 +4163,12 @@ kernels: TEST_F(decodeZeInfoKernelEntryTest, GivenPerThreadMemoryBufferOfSizeBiggerThanMinimalWhenTypeIsScratchAndSimtThreadThenSetsProperFieldsInDescriptor) { ConstStringRef zeinfo = R"===( -kernels: +kernels: - name : some_kernel - execution_env: + execution_env: simd_size: 8 spill_size: 2048 - per_thread_memory_buffers: + per_thread_memory_buffers: - type: scratch usage: spill_fill_space size: 2048 @@ -4185,12 +4185,12 @@ kernels: TEST_F(decodeZeInfoKernelEntryTest, GivenPerThreadMemoryBufferBiggerThanMinimalWhenSlotAndSimtThreadIsProvidedThenSetsProperFieldsInDescriptorInCorrectSlot) { ConstStringRef zeinfo = R"===( -kernels: +kernels: - name : some_kernel - execution_env: + execution_env: simd_size: 8 private_size: 2048 - per_thread_memory_buffers: + per_thread_memory_buffers: - type: scratch usage: private_space size: 2048 @@ -4208,13 +4208,13 @@ kernels: TEST_F(decodeZeInfoKernelEntryTest, GivenPerThreadMemoryForSpillAndPrivateDefinedInSeparateFieldsThenProperFieldsInDescriptorAreSet) { ConstStringRef zeinfo = R"===( -kernels: +kernels: - name : some_kernel - execution_env: + execution_env: simd_size: 8 private_size: 256 spill_size: 512 - per_thread_memory_buffers: + per_thread_memory_buffers: - type: scratch usage: single_space size: 1024 @@ -4235,13 +4235,13 @@ kernels: TEST_F(decodeZeInfoKernelEntryTest, GivenPerThreadMemoryForSpillAndPrivateDefinedInOlderZeInfoThenFallbackToLegacySlotMeaning) { ConstStringRef zeinfo = R"===( -kernels: +kernels: - name : some_kernel - execution_env: + execution_env: simd_size: 8 private_size: 256 spill_size: 512 - per_thread_memory_buffers: + per_thread_memory_buffers: - type: scratch usage: single_space size: 1024 @@ -4262,11 +4262,11 @@ kernels: TEST_F(decodeZeInfoKernelEntryTest, GivenPerThreadMemoryBufferOfSizeBiggerThanMinimalWhenTypeIsScratchThenSetsProperFieldsInDescriptor) { ConstStringRef zeinfo = R"===( -kernels: +kernels: - name : some_kernel - execution_env: + execution_env: simd_size: 8 - per_thread_memory_buffers: + per_thread_memory_buffers: - type: scratch usage: private_space size: 1540 @@ -4281,11 +4281,11 @@ kernels: TEST_F(decodeZeInfoKernelEntryTest, GivenPerThreadMemoryBufferWhenSlotIsProvidedThenSetsProperFieldsInDescriptorInCorrectSlot) { ConstStringRef zeinfo = R"===( -kernels: +kernels: - name : some_kernel - execution_env: + execution_env: simd_size: 8 - per_thread_memory_buffers: + per_thread_memory_buffers: - type: scratch usage: private_space size: 1024 @@ -4301,11 +4301,11 @@ kernels: TEST_F(decodeZeInfoKernelEntryTest, GivenPerThreadMemoryBufferWhenSlotIsInvalidThenFails) { ConstStringRef zeinfo = R"===( -kernels: +kernels: - name : some_kernel - execution_env: + execution_env: simd_size: 8 - per_thread_memory_buffers: + per_thread_memory_buffers: - type: scratch usage: private_space size: 512 @@ -4319,11 +4319,11 @@ kernels: TEST_F(decodeZeInfoKernelEntryTest, GivenPerThreadMemoryBufferWithInvalidSizeThenErrorIsReturned) { ConstStringRef zeinfo = R"===( -kernels: +kernels: - name : some_kernel - execution_env: + execution_env: simd_size: 8 - per_thread_memory_buffers: + per_thread_memory_buffers: - type: scratch usage: private_space size: 0 @@ -4336,11 +4336,11 @@ kernels: TEST_F(decodeZeInfoKernelEntryTest, GivenPerThreadMemoryBufferWithMultipleScratchEntriesForTheSameSlotThenFails) { ConstStringRef zeinfo = R"===( -kernels: +kernels: - name : some_kernel - execution_env: + execution_env: simd_size: 8 - per_thread_memory_buffers: + per_thread_memory_buffers: - type: scratch usage: private_space size: 512 @@ -4358,7 +4358,7 @@ TEST(DecodeZebinTest, GivenKernelWithoutCorrespondingTextSectionThenFail) { ConstStringRef zeinfo = R"===( kernels: - name : some_kernel - execution_env: + execution_env: simd_size: 8 )==="; NEO::ProgramInfo programInfo; @@ -4409,7 +4409,7 @@ TEST_F(decodeZeInfoKernelEntryTest, GivenValidExecutionEnvironmentThenPopulateKe ConstStringRef zeinfo = R"===( kernels: - name : some_kernel - execution_env: + execution_env: barrier_count : 7 disable_mid_thread_preemption : true grf_count : 13 @@ -4491,9 +4491,9 @@ TEST_F(decodeZeInfoKernelEntryTest, GivenArgTypeLocalIdWhenOffsetIsNonZeroThenFa ConstStringRef zeinfo = R"===( kernels: - name : some_kernel - execution_env: + execution_env: simd_size: 8 - per_thread_payload_arguments: + per_thread_payload_arguments: - arg_type: local_id offset: 4 size: 192 @@ -4508,9 +4508,9 @@ TEST_F(decodeZeInfoKernelEntryTest, GivenArgTypeLocalIdWhenSizeIsInvalidThenFail ConstStringRef zeinfo = R"===( kernels: - name : some_kernel - execution_env: + execution_env: simd_size: 8 - per_thread_payload_arguments: + per_thread_payload_arguments: - arg_type: local_id offset: 0 size: 7 @@ -4530,10 +4530,10 @@ TEST_F(decodeZeInfoKernelEntryTest, GivenArgTypeLocalIdWhenSizeIsValidThenCalcul std::string zeinfo = R"===( kernels: - name : some_kernel - execution_env: + execution_env: simd_size: )===" + std::to_string(simdSize) + R"===( - per_thread_payload_arguments: + per_thread_payload_arguments: - arg_type: local_id offset: 0 size: )===" + @@ -4558,9 +4558,9 @@ TEST_F(decodeZeInfoKernelEntryTest, GivenArgTypePackedLocalIdWhenOffsetIsNonZero ConstStringRef zeinfo = R"===( kernels: - name : some_kernel - execution_env: + execution_env: simd_size: 1 - per_thread_payload_arguments: + per_thread_payload_arguments: - arg_type: packed_local_ids offset: 4 size: 6 @@ -4575,9 +4575,9 @@ TEST_F(decodeZeInfoKernelEntryTest, GivenArgTypePackedLocalIdWhenSizeIsInvalidTh ConstStringRef zeinfo = R"===( kernels: - name : some_kernel - execution_env: + execution_env: simd_size: 1 - per_thread_payload_arguments: + per_thread_payload_arguments: - arg_type: packed_local_ids offset: 0 size: 1 @@ -4597,10 +4597,10 @@ TEST_F(decodeZeInfoKernelEntryTest, GivenArgTypePackedLocalIdWhenSizeIsValidThen std::string zeinfo = R"===( kernels: - name : some_kernel - execution_env: + execution_env: simd_size: )===" + std::to_string(simdSize) + R"===( - per_thread_payload_arguments: + per_thread_payload_arguments: - arg_type: packed_local_ids offset: 0 size: )===" + @@ -4635,12 +4635,12 @@ TEST_F(decodeZeInfoKernelEntryTest, GivenBufferPointerArgWhenAddressSpaceIsKnown std::string zeinfo = R"===( kernels: - name : 'some_kernel' - execution_env: + execution_env: simd_size: 32 - payload_arguments: + payload_arguments: - arg_type : arg_bypointer offset : 16 - size : 8 + size : 8 arg_index : 0 addrmode : stateless )===" + (addressSpace.first.empty() ? "" : ("addrspace : " + addressSpace.first.str())) + @@ -4663,9 +4663,9 @@ TEST_F(decodeZeInfoKernelEntryTest, GivenPointerArgWhenAddressSpaceIsImageThenPo ConstStringRef zeinfo = R"===( kernels: - name : 'some_kernel' - execution_env: + execution_env: simd_size: 32 - payload_arguments: + payload_arguments: - arg_type : arg_bypointer arg_index : 0 addrspace: image @@ -4694,12 +4694,12 @@ TEST_F(decodeZeInfoKernelEntryTest, GivenPointerArgWhenAccessQualifierIsKnownThe std::string zeinfo = R"===( kernels: - name : some_kernel - execution_env: + execution_env: simd_size: 32 - payload_arguments: + payload_arguments: - arg_type : arg_bypointer offset : 16 - size : 8 + size : 8 arg_index : 0 addrmode : stateless )===" + (accessQualifier.first.empty() ? "" : ("access_type : " + accessQualifier.first.str())) + @@ -4722,12 +4722,12 @@ TEST_F(decodeZeInfoKernelEntryTest, GivenNonPointerArgWhenAddressSpaceIsStateles std::string zeinfo = R"===( kernels: - name : some_kernel - execution_env: + execution_env: simd_size: 32 - payload_arguments: + payload_arguments: - arg_type : arg_bypointer offset : 16 - size : 8 + size : 8 arg_index : 0 addrmode : stateless addrspace : )===" + @@ -4745,12 +4745,12 @@ TEST_F(decodeZeInfoKernelEntryTest, GivenPointerArgWhenMemoryAddressingModeIsUkn ConstStringRef zeinfo = R"===( kernels: - name : some_kernel - execution_env: + execution_env: simd_size: 8 - payload_arguments: + payload_arguments: - arg_type : arg_bypointer offset : 16 - size : 8 + size : 8 arg_index : 0 )==="; auto err = decodeZeInfoKernelEntry(zeinfo); @@ -4771,12 +4771,12 @@ TEST_F(decodeZeInfoKernelEntryTest, GivenPointerArgWhenMemoryAddressingModeIsKno std::string zeinfo = R"===( kernels: - name : some_kernel - execution_env: + execution_env: simd_size: 32 - payload_arguments: + payload_arguments: - arg_type : arg_bypointer offset : 16 - size : 8 + size : 8 arg_index : 0 )===" + (addressingMode.first.empty() ? "" : ("addrmode : " + addressingMode.first.str())) + R"===( @@ -4848,9 +4848,9 @@ TEST_F(decodeZeInfoKernelEntryTest, GivenArgTypeLocalSizeWhenArgSizeIsInvalidThe ConstStringRef zeinfo = R"===( kernels: - name : some_kernel - execution_env: + execution_env: simd_size: 32 - payload_arguments: + payload_arguments: - arg_type : local_size offset : 16 size : 7 @@ -4868,9 +4868,9 @@ TEST_F(decodeZeInfoKernelEntryTest, GivenArgTypeLocalSizeWhenArgSizeValidThenPop std::string zeinfo = R"===( kernels: - name : some_kernel - execution_env: + execution_env: simd_size: 32 - payload_arguments: + payload_arguments: - arg_type : local_size offset : 16 size : )===" + @@ -4892,9 +4892,9 @@ TEST_F(decodeZeInfoKernelEntryTest, GivenArgTypeGlobaIdOffsetWhenArgSizeIsInvali ConstStringRef zeinfo = R"===( kernels: - name : some_kernel - execution_env: + execution_env: simd_size: 32 - payload_arguments: + payload_arguments: - arg_type : global_id_offset offset : 16 size : 7 @@ -4957,9 +4957,9 @@ TEST_F(decodeZeInfoKernelEntryTest, GivenArgTypeGroupCountWhenArgSizeIsInvalidTh ConstStringRef zeinfo = R"===( kernels: - name : some_kernel - execution_env: + execution_env: simd_size: 32 - payload_arguments: + payload_arguments: - arg_type : group_count offset : 16 size : 7 @@ -4977,9 +4977,9 @@ TEST_F(decodeZeInfoKernelEntryTest, GivenArgTypeGroupCountWhenArgSizeValidThenPo std::string zeinfo = R"===( kernels: - name : some_kernel - execution_env: + execution_env: simd_size: 32 - payload_arguments: + payload_arguments: - arg_type : group_count offset : 16 size : )===" + @@ -5001,9 +5001,9 @@ TEST_F(decodeZeInfoKernelEntryTest, GivenArgTypeEnqueuedLocalSizeWhenArgSizeIsIn ConstStringRef zeinfo = R"===( kernels: - name : some_kernel - execution_env: + execution_env: simd_size: 32 - payload_arguments: + payload_arguments: - arg_type : enqueued_local_size offset : 16 size : 7 @@ -5042,9 +5042,9 @@ TEST_F(decodeZeInfoKernelEntryTest, GivenArgTypeEnqueuedLocalSizeWhenArgSizeVali std::string zeinfo = R"===( kernels: - name : some_kernel - execution_env: + execution_env: simd_size: 32 - payload_arguments: + payload_arguments: - arg_type : enqueued_local_size offset : 16 size : )===" + @@ -5066,9 +5066,9 @@ TEST_F(decodeZeInfoKernelEntryTest, GivenArgTypeGlobalSizeWhenArgSizeIsInvalidTh ConstStringRef zeinfo = R"===( kernels: - name : some_kernel - execution_env: + execution_env: simd_size: 32 - payload_arguments: + payload_arguments: - arg_type : global_size offset : 16 size : 7 @@ -5083,9 +5083,9 @@ TEST_F(decodeZeInfoKernelEntryTest, givenRegionArgTypesWhenArgSizeIsInvalidThenF ConstStringRef zeInfoRegionGroupSize = R"===( kernels: - name : some_kernel - execution_env: + execution_env: simd_size: 32 - payload_arguments: + payload_arguments: - arg_type : region_group_size offset : 16 size : 7 @@ -5098,9 +5098,9 @@ TEST_F(decodeZeInfoKernelEntryTest, givenRegionArgTypesWhenArgSizeIsInvalidThenF ConstStringRef zeInfoRegionGroupDim = R"===( kernels: - name : some_kernel - execution_env: + execution_env: simd_size: 32 - payload_arguments: + payload_arguments: - arg_type : region_group_dimension offset : 16 size : 7 @@ -5113,9 +5113,9 @@ TEST_F(decodeZeInfoKernelEntryTest, givenRegionArgTypesWhenArgSizeIsInvalidThenF ConstStringRef zeInfoRegionGroupCount = R"===( kernels: - name : some_kernel - execution_env: + execution_env: simd_size: 32 - payload_arguments: + payload_arguments: - arg_type : region_group_wg_count offset : 16 size : 7 @@ -5130,9 +5130,9 @@ TEST_F(decodeZeInfoKernelEntryTest, givenRegionArgTypesWhenArgSizeIsCorrectThenR ConstStringRef zeInfoRegionGroupSize = R"===( kernels: - name : some_kernel - execution_env: + execution_env: simd_size: 32 - payload_arguments: + payload_arguments: - arg_type : region_group_size offset : 16 size : 12 @@ -5149,9 +5149,9 @@ TEST_F(decodeZeInfoKernelEntryTest, givenRegionArgTypesWhenArgSizeIsCorrectThenR ConstStringRef zeInfoRegionGroupDim = R"===( kernels: - name : some_kernel - execution_env: + execution_env: simd_size: 32 - payload_arguments: + payload_arguments: - arg_type : region_group_dimension offset : 16 size : 4 @@ -5167,9 +5167,9 @@ TEST_F(decodeZeInfoKernelEntryTest, givenRegionArgTypesWhenArgSizeIsCorrectThenR ConstStringRef zeInfoRegionGroupCount = R"===( kernels: - name : some_kernel - execution_env: + execution_env: simd_size: 32 - payload_arguments: + payload_arguments: - arg_type : region_group_wg_count offset : 16 size : 4 @@ -5185,9 +5185,9 @@ TEST_F(decodeZeInfoKernelEntryTest, givenRegionArgTypesWhenArgSizeIsCorrectThenR ConstStringRef zeInfoRegionGroupBarrier = R"===( kernels: - name : some_kernel - execution_env: + execution_env: simd_size: 32 - payload_arguments: + payload_arguments: - arg_type : region_group_barrier_buffer offset : 16 size : 8 @@ -5208,9 +5208,9 @@ TEST_F(decodeZeInfoKernelEntryTest, GivenArgTypeGlobalSizeWhenArgSizeValidThenPo std::string zeinfo = R"===( kernels: - name : some_kernel - execution_env: + execution_env: simd_size: 32 - payload_arguments: + payload_arguments: - arg_type : global_size offset : 16 size : )===" + @@ -5232,9 +5232,9 @@ TEST_F(decodeZeInfoKernelEntryTest, GivenArgTypeBufferOffsetWhenOffsetAndSizeVal ConstStringRef zeinfo = R"===( kernels: - name : some_kernel - execution_env: + execution_env: simd_size: 32 - payload_arguments: + payload_arguments: - arg_type: buffer_offset offset: 8 size: 4 @@ -5269,7 +5269,7 @@ TEST_F(decodeZeInfoKernelEntryTest, givenPureStatefulArgWithBufferAddressWhenThe arg_index: 0 binding_table_indices: - bti_value: 0 - arg_index: 0 + arg_index: 0 )==="; auto err = decodeZeInfoKernelEntry(zeinfo); EXPECT_EQ(NEO::DecodeError::success, err); @@ -5288,9 +5288,9 @@ TEST_F(decodeZeInfoKernelEntryTest, GivenNoArgsThenPopulatesKernelDescriptor) { ConstStringRef zeinfo = R"===( kernels: - name : some_kernel - execution_env: + execution_env: simd_size: 32 - + )==="; auto err = decodeZeInfoKernelEntry(zeinfo); EXPECT_EQ(NEO::DecodeError::success, err); @@ -5342,9 +5342,9 @@ TEST_F(decodeZeInfoKernelEntryTest, GivenArgTypeWorkDimensionsWhenSizeIsValidThe ConstStringRef zeinfo = R"===( kernels: - name : some_kernel - execution_env: + execution_env: simd_size: 32 - payload_arguments: + payload_arguments: - arg_type: work_dimensions offset: 32 size: 4