P4 to Git Change 1313477 by lmoriche@lmoriche_opencl_dev on 2016/09/12 17:22:37

SWDEV-94610 - Split the HSAILProgram::hsailOptions into preprocessorOptions amd codegenOptions. Pass the codegenOptions to the IR->ISA stage (linkImpl).

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/roccompiler.cpp#15 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocprogram.cpp#31 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocprogram.hpp#13 edit

rocclr/runtime/device/rocm/roccompiler.cpp

@@ -181,7 +181,7 @@ HSAILProgram::compileImpl_LC(
     driverOptions.append(" -include-pch " + pch->Name());
     driverOptions.append(" -Xclang -fno-validate-pch");
 
-    driverOptions.append(hsailOptions(options));
+    driverOptions.append(preprocessorOptions(options));
     if (clVer >= 200) {
         std::stringstream opts;
         //Add only for CL2.0 and later
@@ -197,7 +197,7 @@ HSAILProgram::compileImpl_LC(
     }
 
     // Tokenize the options string into a vector of strings
-    std::istringstream istrstr(driverOptions);
+    std::istringstream istrstr(driverOptions + codegenOptions(options));
     std::istream_iterator<std::string> sit(istrstr), end;
     std::vector<std::string> params(sit, end);
 
@@ -347,7 +347,8 @@ HSAILProgram::compileImpl(
     }
 
     //Compile source to IR
-    this->compileOptions_.append(hsailOptions(options));
+    this->compileOptions_.append(preprocessorOptions(options));
+    this->compileOptions_.append(codegenOptions(options));
 
     errorCode = g_complibApi._aclCompile(device().compiler(),
         binaryElf_,