From 8b95f29714ef52a4bc10d90fb7ff906d6a778fd4 Mon Sep 17 00:00:00 2001
From: foreman <dl.constructicon@amd.com>
Date: Tue, 8 Mar 2016 14:51:18 -0500
Subject: [PATCH] P4 to Git Change 1245012 by gandryey@gera-w8 on 2016/03/08
 14:41:35

	SWDEV-89511 - Enable F16 KHR extension

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/device.hpp#268 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpusettings.cpp#343 edit
... //depot/stg/opencl/drivers/opencl/runtime/utils/flags.hpp#253 edit


[ROCm/clr commit: 08721493fadb212694880236125516abc1ff7543]
---
 projects/clr/rocclr/runtime/device/device.hpp          | 2 --
 projects/clr/rocclr/runtime/device/gpu/gpusettings.cpp | 7 +------
 projects/clr/rocclr/runtime/utils/flags.hpp            | 2 --
 3 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/projects/clr/rocclr/runtime/device/device.hpp b/projects/clr/rocclr/runtime/device/device.hpp
index 7c7edecd0d..5f58f27d02 100644
--- a/projects/clr/rocclr/runtime/device/device.hpp
+++ b/projects/clr/rocclr/runtime/device/device.hpp
@@ -112,7 +112,6 @@ enum OclExtensions {
     ClKhrMipMapImageWrites,
     ClKhrIlProgram,
     ClAMDLiquidFlash,
-    ClAmdFp16,
     ClExtTotal
 };
 
@@ -155,7 +154,6 @@ OclExtensionsString[] = {
     "cl_khr_mipmap_image_writes ",
     "",
     (IS_MAINLINE || IS_LINUX) ? "" : "cl_amd_liquid_flash ",
-    "cl_amd_fp16 ",
     NULL
 };
 
diff --git a/projects/clr/rocclr/runtime/device/gpu/gpusettings.cpp b/projects/clr/rocclr/runtime/device/gpu/gpusettings.cpp
index a3e362dcf6..0fe447530f 100644
--- a/projects/clr/rocclr/runtime/device/gpu/gpusettings.cpp
+++ b/projects/clr/rocclr/runtime/device/gpu/gpusettings.cpp
@@ -200,12 +200,7 @@ Settings::create(
         // Keep this false even though we have support
         // singleFpDenorm_ = true;
         viPlus_ = true;
-        if (GPU_FORCE_FP16) {
-            enableExtension(ClKhrFp16);
-        }
-        else {
-            enableExtension(ClAmdFp16);
-        }
+        enableExtension(ClKhrFp16);
         // Fall through to CI ...
     case CAL_TARGET_KALINDI:
     case CAL_TARGET_SPECTRE:
diff --git a/projects/clr/rocclr/runtime/utils/flags.hpp b/projects/clr/rocclr/runtime/utils/flags.hpp
index e183f1775a..674a11ac3f 100644
--- a/projects/clr/rocclr/runtime/utils/flags.hpp
+++ b/projects/clr/rocclr/runtime/utils/flags.hpp
@@ -169,8 +169,6 @@ release(bool, DISABLE_DEFERRED_ALLOC, false,                                  \
         "Disables deferred memory allocation on device")                      \
 release(int, AMD_GPU_FORCE_SINGLE_FP_DENORM, -1,                              \
         "Force denorm for single precision: -1 - don't force, 0 - disable, 1 - enable") \
-release(bool, GPU_FORCE_FP16, false,                                          \
-        "Force CL_KHR_FP16 extension")                                        \
 debug(bool, OCL_FORCE_CPU_SVM, false,                                         \
         "force svm support for CPU")                                          \
 release(uint, OCL_SET_SVM_SIZE, 4096,                                           \