P4 to Git Change 1332744 by lmoriche@lmoriche_opencl_lc on 2016/10/27 12:50:35

SWDEV-105604 - [OCL-LC-PAL] OpenCL program manager for LC on PAL
	- Use the gfxip target names by default

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palcompiler.cpp#6 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palprogram.cpp#17 edit

rocclr/runtime/device/pal/palcompiler.cpp

@@ -243,14 +243,9 @@ LightningProgram::compileImpl(
     driverOptions.append(optLevel.str());
 
     // Set the machine target
-#if 0
     std::ostringstream mCPU;
     mCPU << " -mcpu=gfx" << dev().hwInfo()->gfxipVersion_;
     driverOptions.append(mCPU.str());
-#else
-    driverOptions.append(" -mcpu=");
-    driverOptions.append(dev().hwInfo()->machineTarget_);
-#endif
 
     driverOptions.append(options->llvmOptions);
     driverOptions.append(hsailOptions());

rocclr/runtime/device/pal/palprogram.cpp

@@ -1213,14 +1213,9 @@ LightningProgram::linkImpl(amd::option::Options *options)
     std::string codegenOptions(options->llvmOptions);
 
     // Set the machine target
-#if 0
     std::ostringstream mCPU;
     mCPU << " -mcpu=gfx" << dev().hwInfo()->gfxipVersion_;
     codegenOptions.append(mCPU.str());
-#else
-    codegenOptions.append(" -mcpu=");
-    codegenOptions.append(dev().hwInfo()->machineTarget_);
-#endif
 
     // Set the -O#
     std::ostringstream optLevel;