From 4bb770501fb996cb9888375543390b70ca353d2e Mon Sep 17 00:00:00 2001 From: foreman Date: Tue, 27 Oct 2015 14:41:07 -0400 Subject: [PATCH] P4 to Git Change 1204398 by ashi1@ashi1_win50 on 2015/10/27 14:24:02 SWDEV-79695 - Back out changelist 1204387 due to ocltst build issues with new ocltst changes Affected files ... ... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/common/v0_8/if_acl.cpp#80 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/gpu/MDParser/AMDILMDInterface.h#5 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/gpu/MDParser/AMDILMDParser.l#6 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/gpu/MDParser/AMDILMDTypes.cpp#5 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/gpu/MDParser/lex.yy.cpp#7 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/gpu/metadata.cpp#11 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/include/v0_8/aclEnums.h#25 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/include/v0_8/aclStructs.h#20 edit ... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/HSAIL/HSAILKernel.h#14 edit ... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/HSAIL/HSAILKernelManager.cpp#39 edit ... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/HSAIL/HSAILModuleInfo.cpp#17 edit ... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/HSAIL/HSAILParseMetadata.cpp#15 edit ... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/complib/CLAssumptionCheck.cpp#46 edit ... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/complib/CLEnumCheck.cpp#50 edit [ROCm/clr commit: de5ffe89f11acd1cf2608188ea44587438e0fd88] --- .../lib/backends/common/v0_8/if_acl.cpp | 33 +------------------ .../compiler/lib/include/v0_8/aclEnums.h | 4 +-- .../compiler/lib/include/v0_8/aclStructs.h | 3 -- 3 files changed, 2 insertions(+), 38 deletions(-) diff --git a/projects/clr/rocclr/compiler/lib/backends/common/v0_8/if_acl.cpp b/projects/clr/rocclr/compiler/lib/backends/common/v0_8/if_acl.cpp index 49ba01f7fb..98b080787e 100644 --- a/projects/clr/rocclr/compiler/lib/backends/common/v0_8/if_acl.cpp +++ b/projects/clr/rocclr/compiler/lib/backends/common/v0_8/if_acl.cpp @@ -2356,10 +2356,6 @@ void deserializeCLMetadata(const char* ptr, aclMetadata * const md, const size_t md->deviceName = tmp_ptr; tmp_ptr += md->deviceNameSize + 1; - // de-serialize the vec type hint - md->vth = tmp_ptr; - tmp_ptr += md->vecTypeHintSize + 1; - // de-serailize the arguments md->args = reinterpret_cast(tmp_ptr); tmp_ptr += (md->numArgs + 1) * sizeof(aclArgData); @@ -2829,34 +2825,7 @@ if_aclQueryInfo(aclCompiler *cl, } break; } - case RT_WORK_GROUP_SIZE_HINT: { - size_t work_group_size_hint_size = sizeof(md->wsh); - if (!ptr) { - *size = work_group_size_hint_size; - success = true; - } else if (*size >= work_group_size_hint_size) { - memcpy(ptr, md->wsh, work_group_size_hint_size); - success = true; - } - break; - } - case RT_VEC_TYPE_HINT: { - if (!ptr) { - *size = md->vecTypeHintSize; - success = true; - } else if (*size >= md->vecTypeHintSize) { - // vecTypeHint is a pointer, which is serialized by serializeMetadata() to NULL - // in binary; to get the data deserializeCLMetadata() is needed - aclMetadata *deserializedMd = static_cast(alloca(roSize)); - deserializeCLMetadata(reinterpret_cast(roSec), deserializedMd, roSize); - if (deserializedMd->vth && deserializedMd->vecTypeHintSize == md->vecTypeHintSize) { - strncpy(reinterpret_cast(ptr), deserializedMd->vth, deserializedMd->vecTypeHintSize); - success = true; - } - } - break; - } - } + } return (success) ? ACL_SUCCESS : ACL_ERROR; } static unsigned getSize(aclArgDataType data) diff --git a/projects/clr/rocclr/compiler/lib/include/v0_8/aclEnums.h b/projects/clr/rocclr/compiler/lib/include/v0_8/aclEnums.h index 928cd048fc..25264ada80 100644 --- a/projects/clr/rocclr/compiler/lib/include/v0_8/aclEnums.h +++ b/projects/clr/rocclr/compiler/lib/include/v0_8/aclEnums.h @@ -218,9 +218,7 @@ typedef enum _rt_query_types_enum_0_8 { RT_NUM_KERNEL_HIDDEN_ARGS = 22, RT_CONTAINS_SPIRV = 23, RT_WAVES_PER_SIMD_HINT = 24, - RT_WORK_GROUP_SIZE_HINT = 25, - RT_VEC_TYPE_HINT = 26, - RT_LAST_TYPE = 27 + RT_LAST_TYPE = 25 } aclQueryType_0_8; //! An enumeration for the various GPU capabilities diff --git a/projects/clr/rocclr/compiler/lib/include/v0_8/aclStructs.h b/projects/clr/rocclr/compiler/lib/include/v0_8/aclStructs.h index 42206cb1fd..0e648669b9 100644 --- a/projects/clr/rocclr/compiler/lib/include/v0_8/aclStructs.h +++ b/projects/clr/rocclr/compiler/lib/include/v0_8/aclStructs.h @@ -121,9 +121,6 @@ typedef struct _acl_metadata_0_8 { uint32_t kernel_index; // RT_KERNEL_INDEX uint32_t numHiddenKernelArgs; // RT_NUM_KERNEL_HIDDEN_ARGS uint32_t wavesPerSimdHint; // RT_WAVES_PER_SIMD_HINT - uint32_t wsh[3]; // RT_WORK_GROUP_SIZE_HINT - size_t vecTypeHintSize; - const char *vth; // RT_VEC_TYPE_HINT } aclMetadata_0_8; //! An structure that holds information on the capabilities of the bif device.