From e7b4236c616385f2fca90cef7a829d43474e5419 Mon Sep 17 00:00:00 2001
From: foreman <dl.constructicon@amd.com>
Date: Mon, 9 Nov 2015 14:24:12 -0500
Subject: [PATCH] P4 to Git Change 1208996 by bsumner@bsumner-lin-opencl on
 2015/11/09 14:14:50

	SWDEV-10637 - clean up half_math and merge CI lib into main lib

Affected files ...

... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/common/library.cpp#19 edit
... //depot/stg/opencl/drivers/opencl/library/build/Makefile.library#46 edit
... //depot/stg/opencl/drivers/opencl/library/hsa/Makefile#4 edit
... //depot/stg/opencl/drivers/opencl/library/hsa/hsail-amd-ci/Makefile#2 delete
... //depot/stg/opencl/drivers/opencl/library/hsa/hsail-amd-ci/build/Makefile#2 delete
... //depot/stg/opencl/drivers/opencl/library/hsa/hsail-amd-ci/build/Makefile.hsail-amd-ci#18 delete
... //depot/stg/opencl/drivers/opencl/library/hsa/hsail-amd-ci/src/math32/half_argred.cl#2 delete
... //depot/stg/opencl/drivers/opencl/library/hsa/hsail-amd-ci/src/math32/half_cosF.cl#2 delete
... //depot/stg/opencl/drivers/opencl/library/hsa/hsail-amd-ci/src/math32/half_expF.cl#2 delete
... //depot/stg/opencl/drivers/opencl/library/hsa/hsail-amd-ci/src/math32/half_logF.cl#2 delete
... //depot/stg/opencl/drivers/opencl/library/hsa/hsail-amd-ci/src/math32/half_rsqrtF.cl#2 delete
... //depot/stg/opencl/drivers/opencl/library/hsa/hsail-amd-ci/src/math32/half_sinF.cl#2 delete
... //depot/stg/opencl/drivers/opencl/library/hsa/hsail-amd-ci/src/math32/half_sincos.cl#2 delete
... //depot/stg/opencl/drivers/opencl/library/hsa/hsail-amd-ci/src/math32/half_sqrtF.cl#2 delete
... //depot/stg/opencl/drivers/opencl/library/hsa/hsail/src/math32/argredhalfF.cl#1 add
... //depot/stg/opencl/drivers/opencl/library/hsa/hsail/src/math32/half_cosF.cl#3 edit
... //depot/stg/opencl/drivers/opencl/library/hsa/hsail/src/math32/half_divideF.cl#4 edit
... //depot/stg/opencl/drivers/opencl/library/hsa/hsail/src/math32/half_exp10F.cl#1 add
... //depot/stg/opencl/drivers/opencl/library/hsa/hsail/src/math32/half_exp2F.cl#1 add
... //depot/stg/opencl/drivers/opencl/library/hsa/hsail/src/math32/half_expF.cl#3 edit
... //depot/stg/opencl/drivers/opencl/library/hsa/hsail/src/math32/half_log10F.cl#1 add
... //depot/stg/opencl/drivers/opencl/library/hsa/hsail/src/math32/half_log2F.cl#1 add
... //depot/stg/opencl/drivers/opencl/library/hsa/hsail/src/math32/half_logF.cl#4 edit
... //depot/stg/opencl/drivers/opencl/library/hsa/hsail/src/math32/half_powrF.cl#2 edit
... //depot/stg/opencl/drivers/opencl/library/hsa/hsail/src/math32/half_recipF.cl#3 edit
... //depot/stg/opencl/drivers/opencl/library/hsa/hsail/src/math32/half_rsqrtF.cl#3 edit
... //depot/stg/opencl/drivers/opencl/library/hsa/hsail/src/math32/half_sinF.cl#3 edit
... //depot/stg/opencl/drivers/opencl/library/hsa/hsail/src/math32/half_sincos.cl#2 delete
... //depot/stg/opencl/drivers/opencl/library/hsa/hsail/src/math32/half_sqrtF.cl#3 edit
... //depot/stg/opencl/drivers/opencl/library/hsa/hsail/src/math32/half_tanF.cl#2 edit
... //depot/stg/opencl/drivers/opencl/library/hsa/hsail/src/math32/sincoshalfF.cl#1 add
... //depot/stg/opencl/drivers/opencl/library/hsa/hsail/src/math32/tanredF.cl#1 add
... //depot/stg/opencl/drivers/opencl/tests/hsa/bin/hsa_dist.pl#3 edit
... //depot/stg/opencl/drivers/opencl/tests/hsa/bin/test_driver.pl#21 edit


[ROCm/clr commit: a8cd48032837677e1152952b98208c0a3c486698]
---
 .../compiler/lib/backends/common/library.cpp    | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/projects/clr/rocclr/compiler/lib/backends/common/library.cpp b/projects/clr/rocclr/compiler/lib/backends/common/library.cpp
index 78816f2bbb..35aeb62725 100644
--- a/projects/clr/rocclr/compiler/lib/backends/common/library.cpp
+++ b/projects/clr/rocclr/compiler/lib/backends/common/library.cpp
@@ -52,7 +52,6 @@ namespace amd {
 #ifdef WITH_TARGET_HSAIL
 // HSAIL libraries
 #include "builtins-hsail.inc"
-#include "builtins-hsail-amd-ci.inc"
 #include "builtins-gcn.inc"
 #include "builtins-ocml.inc"
 #include "builtins-spirv.inc"
@@ -274,15 +273,13 @@ getLibDescs (
         // Library order is important!
         LibDesc[0].start = reinterpret_cast<const char*>(builtins_gcn);
         LibDesc[0].size  = builtins_gcn_size;
-        LibDesc[1].start = reinterpret_cast<const char*>(builtins_hsail_amd_ci);
-        LibDesc[1].size  = builtins_hsail_amd_ci_size;
-        LibDesc[2].start = reinterpret_cast<const char*>(builtins_hsail);
-        LibDesc[2].size  = builtins_hsail_size;
-        LibDesc[3].start = reinterpret_cast<const char*>(builtins_ocml);
-        LibDesc[3].size  = builtins_ocml_size;
-        LibDesc[4].start = reinterpret_cast<const char*>(builtins_spirv);
-        LibDesc[4].size  = builtins_spirv_size;
-        LibDescSize = 5;
+        LibDesc[1].start = reinterpret_cast<const char*>(builtins_hsail);
+        LibDesc[1].size  = builtins_hsail_size;
+        LibDesc[2].start = reinterpret_cast<const char*>(builtins_ocml);
+        LibDesc[2].size  = builtins_ocml_size;
+        LibDesc[3].start = reinterpret_cast<const char*>(builtins_spirv);
+        LibDesc[3].size  = builtins_spirv_size;
+        LibDescSize = 4;
         break;
 #endif // WITH_TARGET_HSAIL