From e592f3ce2d667fd7fa161dca3830f7701778d25c Mon Sep 17 00:00:00 2001 From: foreman Date: Thu, 21 Sep 2017 10:11:44 -0400 Subject: [PATCH] P4 to Git Change 1461559 by akasauro@akasauro_fiji1_opencl_rocm on 2017/09/21 10:00:24 SWDEV-118564 - [OCL-LC-ROCm] Revert deletion of "-x cl" related comments Review: http://ocltc.amd.com/reviews/r/13454/ Affected files ... ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palcompiler.cpp#19 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/roccompiler.cpp#37 edit [ROCm/clr commit: 92570dd4cdb63d3c1fe369935f8be39a543f53fa] --- projects/clr/rocclr/runtime/device/pal/palcompiler.cpp | 3 +++ projects/clr/rocclr/runtime/device/rocm/roccompiler.cpp | 3 +++ 2 files changed, 6 insertions(+) diff --git a/projects/clr/rocclr/runtime/device/pal/palcompiler.cpp b/projects/clr/rocclr/runtime/device/pal/palcompiler.cpp index f16455aea1..778338d0da 100644 --- a/projects/clr/rocclr/runtime/device/pal/palcompiler.cpp +++ b/projects/clr/rocclr/runtime/device/pal/palcompiler.cpp @@ -241,6 +241,9 @@ bool LightningProgram::compileImpl(const std::string& sourceCode, buildLog_ += "Unsupported OpenCL language.\n"; } + // FIXME_Nikolay: the program manager should be setting the language + // driverOptions.append(" -x cl"); + driverOptions.append(" -cl-std=").append(options->oVariables->CLStd); // Set the -O# diff --git a/projects/clr/rocclr/runtime/device/rocm/roccompiler.cpp b/projects/clr/rocclr/runtime/device/rocm/roccompiler.cpp index ab945f7206..1c167d3051 100644 --- a/projects/clr/rocclr/runtime/device/rocm/roccompiler.cpp +++ b/projects/clr/rocclr/runtime/device/rocm/roccompiler.cpp @@ -83,6 +83,9 @@ bool HSAILProgram::compileImpl_LC(const std::string& sourceCode, buildLog_ += "Unsupported OpenCL language.\n"; } + // FIXME_Nikolay: the program manager should be setting the language + // driverOptions.append(" -x cl"); + driverOptions.append(" -cl-std=").append(options->oVariables->CLStd); // Set the -O#