From e64abec9e10394b6c0b43d6783521b9cabfbff2a Mon Sep 17 00:00:00 2001 From: foreman Date: Thu, 5 Nov 2015 06:23:59 -0500 Subject: [PATCH] P4 to Git Change 1207842 by emankov@em-hsa-amd on 2015/11/05 06:14:29 SWDEV-77584 - Compiler Lib: Preparations for enabling HSAIL on OpenCL 1.2 by default. Remove CL1.2 check on HSAIL path. AMDIL on CL1.2 is still by default. [Reason] HSAIL path works on CL1.2, all known issues are fixed. There is no any harm if someone will try to force HSAIL on CL 1.2 offline. [Testing] pre check-in http://ocltc.amd.com:8111/viewModification.html?modId=61694&personal=true&buildTypeId=&tab=vcsModificationBuilds&show_all_builds=true [Reviewers] Stanislav Mekhanoshin, Nikolay Haustov http://ocltc.amd.com/reviews/r/8850 Affected files ... ... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/common/v0_8/if_acl.cpp#84 edit --- .../lib/backends/common/v0_8/if_acl.cpp | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/rocclr/compiler/lib/backends/common/v0_8/if_acl.cpp b/rocclr/compiler/lib/backends/common/v0_8/if_acl.cpp index c78fe207f4..d1b8550d3a 100644 --- a/rocclr/compiler/lib/backends/common/v0_8/if_acl.cpp +++ b/rocclr/compiler/lib/backends/common/v0_8/if_acl.cpp @@ -1399,24 +1399,7 @@ internal_compile_failure: acl_error IsValidCompilationOptions(aclBinary *bin, aclLogFunction compile_callback) { - acl_error error_code = ACL_SUCCESS; -#if defined(WITH_TARGET_HSAIL) && defined(WITH_TARGET_AMDIL) - amd::option::Options* opts = reinterpret_cast(bin->options); - std::string major = std::string(opts->oVariables->CLStd).substr(2,1); - std::string error_msg; - if (isHSAILTarget(bin->target) && major == "1") { - error_msg = "Error: HSAIL doesn't support OpenCL version < 2.0."; - error_code = ACL_INVALID_OPTION; - } - if (isAMDILTarget(bin->target) && major == "2") { - error_msg = "Error: AMDIL doesn't support OpenCL version >= 2.0."; - error_code = ACL_INVALID_OPTION; - } - if (ACL_SUCCESS != error_code && compile_callback) { - compile_callback(error_msg.c_str(), error_msg.size()); - } -#endif - return error_code; + return ACL_SUCCESS; } acl_error ACL_API_ENTRY