From e567d64b63674baab4cb20ad63cbffe45cf11551 Mon Sep 17 00:00:00 2001
From: Konstantin Zhuravlyov <kzhuravl_dev@outlook.com>
Date: Tue, 18 Sep 2018 18:40:11 -0400
Subject: [PATCH] OpenCL: Additional changes for 1.9

---
 opencl.xml                         | 10 +++++-----
 runtime/device/rocm/rocschedcl.cpp |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/opencl.xml b/opencl.xml
index c53f8d7..3695aa5 100644
--- a/opencl.xml
+++ b/opencl.xml
@@ -3,14 +3,14 @@
   <remote name="RadeonOpenCompute" fetch="https://github.com/RadeonOpenCompute/"/>
   <remote name="KhronosGroup" fetch="https://github.com/KhronosGroup/"/>
 
-  <default remote="RadeonOpenCompute" revision="master" sync-c="true" sync-j="4"/>
+  <default remote="RadeonOpenCompute" revision="roc-1.9.x" sync-c="true" sync-j="4"/>
 
   <project path="opencl" name="ROCm-OpenCL-Runtime"/>
   <project path="opencl/compiler/driver" name="ROCm-OpenCL-Driver"/>
-  <project path="opencl/compiler/llvm" name="llvm" revision="amd-common"/>
-  <project path="opencl/compiler/llvm/tools/clang" name="clang" revision="amd-common"/>
-  <project path="opencl/compiler/llvm/tools/lld" name="lld" revision="amd-common"/>
+  <project path="opencl/compiler/llvm" name="llvm"/>
+  <project path="opencl/compiler/llvm/tools/clang" name="clang"/>
+  <project path="opencl/compiler/llvm/tools/lld" name="lld"/>
   <project path="opencl/library/amdgcn" name="ROCm-Device-Libs"/>
 
-  <project path="opencl/api/opencl/khronos/icd" name="OpenCL-ICD-Loader" remote="KhronosGroup"/>
+  <project path="opencl/api/opencl/khronos/icd" name="OpenCL-ICD-Loader" remote="KhronosGroup" revision="b342ff7b7f70a4b3f2cfc53215af8fa20adc3d86"/>
 </manifest>
diff --git a/runtime/device/rocm/rocschedcl.cpp b/runtime/device/rocm/rocschedcl.cpp
index 2db69ca..4249c9b 100644
--- a/runtime/device/rocm/rocschedcl.cpp
+++ b/runtime/device/rocm/rocschedcl.cpp
@@ -7,10 +7,10 @@ namespace roc {
 
 const char* SchedulerSourceCode = SCHEDULER_KERNEL(
 \n
-extern void __amd_scheduler_rocm(__global void*);
+extern void __amd_scheduler(__global void*);
 \n
 __kernel void scheduler(__global void* params) {
-  __amd_scheduler_rocm(params);
+  __amd_scheduler(params);
 }
 \n);