From 59ab6c9f5d5bcc0d4fd9843809d7e5148891c40d Mon Sep 17 00:00:00 2001
From: foreman
Date: Wed, 12 Dec 2018 13:48:23 -0500
Subject: [PATCH] P4 to Git Change 1719380 by gandryey@gera-ocl-lc on
2018/12/12 13:37:56
SWDEV-79445 - OCL generic changes and code clean-up
- Reenable some options in the compilation code.
Affected files ...
... //depot/stg/opencl/drivers/opencl/runtime/device/devprogram.cpp#20 edit
[ROCm/clr commit: 9be10558eb7d1615a471332a0f6a6b824d607a91]
---
.../clr/rocclr/runtime/device/devprogram.cpp | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/projects/clr/rocclr/runtime/device/devprogram.cpp b/projects/clr/rocclr/runtime/device/devprogram.cpp
index 6de12eec8b..1fda9d148b 100644
--- a/projects/clr/rocclr/runtime/device/devprogram.cpp
+++ b/projects/clr/rocclr/runtime/device/devprogram.cpp
@@ -2056,10 +2056,10 @@ std::string Program::ProcessOptions(amd::option::Options* options) {
std::string optionsStr;
if (!isLC()) {
- //optionsStr.append(" -D__AMD__=1");
+ optionsStr.append(" -D__AMD__=1");
- //optionsStr.append(" -D__").append(machineTarget_).append("__=1");
- // optionsStr.append(" -D__").append(machineTarget_).append("=1");
+ optionsStr.append(" -D__").append(machineTarget_).append("__=1");
+ optionsStr.append(" -D__").append(machineTarget_).append("=1");
} else {
int major, minor;
::sscanf(device().info().version_, "OpenCL %d.%d ", &major, &minor);
@@ -2076,12 +2076,12 @@ std::string Program::ProcessOptions(amd::option::Options* options) {
if (!isLC()) {
// Set options for the standard device specific options
// All our devices support these options now
- //if (device().settings().reportFMAF_) {
- // optionsStr.append(" -DFP_FAST_FMAF=1");
- //}
- //if (device().settings().reportFMA_) {
- // optionsStr.append(" -DFP_FAST_FMA=1");
- //}
+ if (device().settings().reportFMAF_) {
+ optionsStr.append(" -DFP_FAST_FMAF=1");
+ }
+ if (device().settings().reportFMA_) {
+ optionsStr.append(" -DFP_FAST_FMA=1");
+ }
}
uint clcStd =