From 082aa5c65eed91807c2f6fc0c0346af065ef1bd2 Mon Sep 17 00:00:00 2001 From: foreman Date: Tue, 22 Sep 2015 13:21:01 -0400 Subject: [PATCH] P4 to Git Change 1193083 by yaxunl@yaxunl_stg_win50 on 2015/09/22 13:13:43 SWDEV-67990 - SPIR-V: Fix translation of OpImageQuerySize[Lod]. Implement it in builtin library as __spirv_ImageQuerySize[Lod] instead of by code. Affected files ... ... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/common/library.cpp#18 edit ... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/SPIRV/SPRVInternal.h#18 edit ... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/SPIRV/SPRVReader.cpp#29 edit ... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/SPIRV/SPRVRegularizeOCL20.cpp#15 edit ... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/SPIRV/SPRVToOCL20.cpp#3 edit ... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/SPIRV/SPRVUtil.cpp#23 edit ... //depot/stg/opencl/drivers/opencl/library/Makefile#26 edit ... //depot/stg/opencl/drivers/opencl/library/build/Makefile.library#45 edit ... //depot/stg/opencl/drivers/opencl/library/spirv/Makefile#1 add ... //depot/stg/opencl/drivers/opencl/library/spirv/build/Makefile#1 add ... //depot/stg/opencl/drivers/opencl/library/spirv/build/Makefile.spirv#1 add ... //depot/stg/opencl/drivers/opencl/library/spirv/inc/spirv.h#1 add ... //depot/stg/opencl/drivers/opencl/library/spirv/src/ImageQuerySize.cl#1 add ... //depot/stg/opencl/drivers/opencl/tests/conformance/devel/2.0/test_conformance/opencl_conformance_tests_spirv.csv#14 edit ... //depot/stg/opencl/drivers/opencl/tests/conformance/devel/2.0/test_conformance/spirv/images_kernel_read_write.zip#1 add ... //depot/stg/opencl/drivers/opencl/tests/conformance/devel/2.0/test_conformance/spirv/images_samplerlessRead.zip#1 add ... //depot/stg/opencl/drivers/opencl/tests/conformance/devel/2.0/test_conformance/spirv/kernel_image_methods.zip#1 add [ROCm/clr commit: 09571ef71b3f52de57784a7c93981122be307dde] --- projects/clr/rocclr/compiler/lib/backends/common/library.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/projects/clr/rocclr/compiler/lib/backends/common/library.cpp b/projects/clr/rocclr/compiler/lib/backends/common/library.cpp index 973288452b..78816f2bbb 100644 --- a/projects/clr/rocclr/compiler/lib/backends/common/library.cpp +++ b/projects/clr/rocclr/compiler/lib/backends/common/library.cpp @@ -55,6 +55,7 @@ namespace amd { #include "builtins-hsail-amd-ci.inc" #include "builtins-gcn.inc" #include "builtins-ocml.inc" +#include "builtins-spirv.inc" #endif #include @@ -279,7 +280,9 @@ getLibDescs ( LibDesc[2].size = builtins_hsail_size; LibDesc[3].start = reinterpret_cast(builtins_ocml); LibDesc[3].size = builtins_ocml_size; - LibDescSize = 4; + LibDesc[4].start = reinterpret_cast(builtins_spirv); + LibDesc[4].size = builtins_spirv_size; + LibDescSize = 5; break; #endif // WITH_TARGET_HSAIL