P4 to Git Change 2036435 by skudchad@skudchad_test2_win_opencl on 2019/11/25 18:48:27

SWDEV-203814 - HIPRTC Inprocess runtime changes

	ReviewBoardURL = http://ocltc.amd.com/reviews/r/18311/diff/

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/devprogram.cpp#71 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/devprogram.hpp#37 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palprogram.hpp#40 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocprogram.cpp#108 edit
... //depot/stg/opencl/drivers/opencl/runtime/platform/program.cpp#106 edit
... //depot/stg/opencl/drivers/opencl/runtime/platform/program.hpp#50 edit


[ROCm/clr commit: f6db6a2209]

projects/clr/rocclr/runtime/platform/program.cpp

@@ -492,7 +492,7 @@ cl_int Program::build(const std::vector<Device*>& devices, const char* options,
   for (const auto& it : devices) {
     option::Options parsedOptions;
     constexpr bool LinkOptsOnly = false;
-    if (!ParseAllOptions(cppstr, parsedOptions, optionChangable, LinkOptsOnly,
+    if ((language_ != HIP) && !ParseAllOptions(cppstr, parsedOptions, optionChangable, LinkOptsOnly,
                          it->settings().useLightning_)) {
       programLog_ = parsedOptions.optionsLog();
       LogError("Parsing compile options failed.");
@@ -520,6 +520,14 @@ cl_int Program::build(const std::vector<Device*>& devices, const char* options,
       parsedOptions.oVariables->XLang = asmLang;
     }
 
+    if (language_ == HIP) {
+      constexpr char hipLang[] = "HIP";
+      parsedOptions.oVariables->CLStd = hipLang;
+      parsedOptions.origOptionStr = options;
+      parsedOptions.oVariables->DumpPrefix = "_hip_";
+      parsedOptions.oVariables->OptLevel = '3';
+    }
+
     // We only build a Device-Program once
     if (devProgram->buildStatus() != CL_BUILD_NONE) {
       continue;