P4 to Git Change 1602604 by gandryey@gera-ocl-lc on 2018/09/06 15:25:43

SWDEV-79445 - OCL generic changes and code clean-up
	- Combine opencl compiler options under a single function.

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/device.cpp#229 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/device.hpp#317 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpusettings.hpp#102 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palcompiler.cpp#25 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palprogram.cpp#68 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palprogram.hpp#23 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palsettings.cpp#55 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palsettings.hpp#19 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/roccompiler.cpp#44 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocprogram.cpp#84 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocprogram.hpp#34 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocsettings.hpp#17 edit

rocclr/runtime/device/rocm/roccompiler.cpp

@@ -129,17 +129,8 @@ bool HSAILProgram::compileImpl(const std::string& sourceCode,
     this->compileOptions_.append(tempFolder);
   }
 
-  // Add only for CL2.0 and later
-  if (options->oVariables->CLStd[2] >= '2') {
-    std::stringstream opts;
-    opts << " -D"
-         << "CL_DEVICE_MAX_GLOBAL_VARIABLE_SIZE=" << device().info().maxGlobalVariableSize_;
-    compileOptions_.append(opts.str());
-  }
-
   // Compile source to IR
-  this->compileOptions_.append(preprocessorOptions(options));
-  this->compileOptions_.append(codegenOptions(options));
+  this->compileOptions_.append(ProcessOptions(options));
 
   errorCode = aclCompile(device().compiler(), binaryElf_,
                          //"-Wf,--support_all_extensions",
@@ -225,7 +216,7 @@ bool LightningProgram::compileImpl(const std::string& sourceCode,
   // Set whole program mode
   driverOptions.append(" -mllvm -amdgpu-early-inline-all -mllvm -amdgpu-prelink");
 
-  driverOptions.append(preprocessorOptions(options));
+  driverOptions.append(ProcessOptions(options));
 
   // Find the temp folder for the OS
   std::string tempFolder = amd::Os::getEnvironment("TEMP");