From 913f1421ca386fa4f28ac825d3507493c770697b Mon Sep 17 00:00:00 2001
From: foreman
Date: Thu, 19 Feb 2015 07:33:38 -0500
Subject: [PATCH] P4 to Git Change 1123371 by akasauro@spb-hlc-tn9-hsa on
2015/02/19 07:20:48
ECR #333756 - tree clean up to prepare for removal of obsolete sc-hsa from stg/opencl
Testing: PSDB
Affected files ...
... //depot/stg/opencl/drivers/opencl/compiler/Android.mk#12 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/gpu/sc/new_make/README#9 edit
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/HSAIL/Android.mk#26 edit
... //depot/stg/opencl/drivers/opencl/compiler/llvm/llvm-device-build.mk#8 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudebugger.hpp#5 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpukernel.hpp#107 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuvirtual.cpp#351 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/hsa_foundation/build/Makefile.oclhsa#4 edit
---
rocclr/runtime/device/gpu/gpudebugger.hpp | 2 +-
rocclr/runtime/device/gpu/gpukernel.hpp | 2 +-
rocclr/runtime/device/gpu/gpuvirtual.cpp | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/rocclr/runtime/device/gpu/gpudebugger.hpp b/rocclr/runtime/device/gpu/gpudebugger.hpp
index 2098808c6e..d01c86452e 100644
--- a/rocclr/runtime/device/gpu/gpudebugger.hpp
+++ b/rocclr/runtime/device/gpu/gpudebugger.hpp
@@ -15,7 +15,7 @@
#include
#include
#include "hsa.h"
-#include "sc-hsa/Interface/SCHSAInterface.h"
+#include "sc/Interface/SCHSAInterface.h"
#include "device/device.hpp"
#include "device/hwdebug.hpp"
#include "acl.h"
diff --git a/rocclr/runtime/device/gpu/gpukernel.hpp b/rocclr/runtime/device/gpu/gpukernel.hpp
index 0be944897b..88c089cf64 100644
--- a/rocclr/runtime/device/gpu/gpukernel.hpp
+++ b/rocclr/runtime/device/gpu/gpukernel.hpp
@@ -13,7 +13,7 @@
#include "platform/sampler.hpp"
#include "device/gpu/gpudevice.hpp"
#include "device/gpu/gpuvirtual.hpp"
-#include "sc-hsa/Interface/SCHSAInterface.h"
+#include "sc/Interface/SCHSAInterface.h"
#include "device/gpu/gpuprintf.hpp"
#include "hsa.h"
//! \namespace gpu GPU Device Implementation
diff --git a/rocclr/runtime/device/gpu/gpuvirtual.cpp b/rocclr/runtime/device/gpu/gpuvirtual.cpp
index 1298872daa..e33348d75b 100644
--- a/rocclr/runtime/device/gpu/gpuvirtual.cpp
+++ b/rocclr/runtime/device/gpu/gpuvirtual.cpp
@@ -16,7 +16,7 @@
#include "device/gpu/gpublit.hpp"
#include "device/gpu/gpudebugger.hpp"
#include "hsa.h"
-#include "sc-hsa/Interface/SCHSAInterface.h"
+#include "sc/Interface/SCHSAInterface.h"
#include
#include