From a965c1eb0efa265e2435d9691030bbffa945001b Mon Sep 17 00:00:00 2001 From: Saleel Kudchadker Date: Wed, 12 Feb 2020 23:19:37 -0800 Subject: [PATCH] HIP version can be set in HIPRTC top layer Indicate that its HIP_VDI to the compiler. Change-Id: I691ddaa764b3ad62398003856c2480b2eece1f46 --- rocclr/device/devprogram.cpp | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/rocclr/device/devprogram.cpp b/rocclr/device/devprogram.cpp index 562dcf31f1..7cd01797aa 100644 --- a/rocclr/device/devprogram.cpp +++ b/rocclr/device/devprogram.cpp @@ -1757,21 +1757,16 @@ std::vector Program::ProcessOptions(amd::option::Options* options) optionsVec.push_back("-DFP_FAST_FMA=1"); } } else { - int major, minor; - ::sscanf(device().info().version_, "OpenCL %d.%d ", &major, &minor); - // FIXME: HIP MINOR/MANJOR needs to be defined if (isHIP()) { - scratchStr.clear(); - optionsVec.push_back(scratchStr.append("-DHIP_VERSION_MAJOR=").append(std::to_string(major * 100))); - scratchStr.clear(); - optionsVec.push_back(scratchStr.append("-DHIP_VERSION_MINOR=").append(std::to_string(minor * 10))); - optionsVec.push_back("-DHIP_VERSION_PATCH=19245"); + optionsVec.push_back("-D__HIP_VDI__=1"); scratchStr.clear(); std::string target(machineTarget_); std::transform(target.begin(), target.end(), target.begin(), ::toupper); optionsVec.push_back(scratchStr.append("-D__HIP_ARCH_").append(target).append("__=1")); } else { + int major, minor; + ::sscanf(device().info().version_, "OpenCL %d.%d ", &major, &minor); std::stringstream ss; ss << "-D__OPENCL_VERSION__=" << (major * 100 + minor * 10); optionsVec.push_back(ss.str());