From c937f585a1f6af0ed96a19318b106010fbf86fdb Mon Sep 17 00:00:00 2001
From: Evgeny <evgeny.shcherbakov@amd.com>
Date: Thu, 3 May 2018 14:42:12 -0500
Subject: [PATCH] test migrated to new kernel OCL ABI

Change-Id: I2cc281316636f7b80dec2c2a78aade39a8ed168c


[ROCm/rocprofiler commit: 1769fea2122deb4e6b6667267a0d15b495c4e261]
---
 projects/rocprofiler/test/CMakeLists.txt      |   2 +-
 .../gfx9_SimpleConvolution.hsaco              | Bin 9392 -> 11136 bytes
 .../simple_convolution/simple_convolution.cpp |   2 +-
 .../simple_convolution/simple_convolution.h   |   1 +
 4 files changed, 3 insertions(+), 2 deletions(-)
 mode change 100644 => 100755 projects/rocprofiler/test/simple_convolution/gfx9_SimpleConvolution.hsaco

diff --git a/projects/rocprofiler/test/CMakeLists.txt b/projects/rocprofiler/test/CMakeLists.txt
index 795325ab37..0fd2eca559 100644
--- a/projects/rocprofiler/test/CMakeLists.txt
+++ b/projects/rocprofiler/test/CMakeLists.txt
@@ -37,4 +37,4 @@ set ( TEST_LIB "tool" )
 set ( TEST_LIB_SRC ${TEST_DIR}/ctrl/tool.cpp ${UTIL_SRC} )
 add_library ( ${TEST_LIB} SHARED ${TEST_LIB_SRC} )
 target_include_directories ( ${TEST_LIB} PRIVATE ${TEST_DIR} ${ROOT_DIR} ${HSA_RUNTIME_INC_PATH} )
-target_link_libraries( ${TEST_LIB} ${ROCPROFILER_TARGET} ${HSA_RUNTIME_LIB} c stdc++ dl pthread rt atomic )
+target_link_libraries ( ${TEST_LIB} ${ROCPROFILER_TARGET} ${HSA_RUNTIME_LIB} c stdc++ dl pthread rt atomic )
diff --git a/projects/rocprofiler/test/simple_convolution/gfx9_SimpleConvolution.hsaco b/projects/rocprofiler/test/simple_convolution/gfx9_SimpleConvolution.hsaco
old mode 100644
new mode 100755
index f65dde425265678a12115e5457d1980b4767fef3..ca0e6bcefc195cbe0b109dd5a4f303b25c1d638d
GIT binary patch
literal 11136
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
NKO^i5ih)uk{{-s);-UZm

literal 9392
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

diff --git a/projects/rocprofiler/test/simple_convolution/simple_convolution.cpp b/projects/rocprofiler/test/simple_convolution/simple_convolution.cpp
index 8052f2b971..d05856bcb5 100644
--- a/projects/rocprofiler/test/simple_convolution/simple_convolution.cpp
+++ b/projects/rocprofiler/test/simple_convolution/simple_convolution.cpp
@@ -299,7 +299,7 @@ void SimpleConvolution::Init() {
   mem_descr_t input_des = GetDescr(INPUT_BUF_ID);
   mem_descr_t mask_des = GetDescr(MASK_BUF_ID);
   mem_descr_t output_des = GetDescr(LOCAL_BUF_ID);
-#if 0
+#if 1
   printf("kernarg_des %p 0x%x\n", kernarg_des.ptr, kernarg_des.size);
   printf("input_des %p 0x%x\n", input_des.ptr, input_des.size);
   printf("mask_des %p 0x%x\n", mask_des.ptr, mask_des.size);
diff --git a/projects/rocprofiler/test/simple_convolution/simple_convolution.h b/projects/rocprofiler/test/simple_convolution/simple_convolution.h
index 38424baaed..a2391b97a2 100644
--- a/projects/rocprofiler/test/simple_convolution/simple_convolution.h
+++ b/projects/rocprofiler/test/simple_convolution/simple_convolution.h
@@ -64,6 +64,7 @@ class SimpleConvolution : public TestKernel {
     uint32_t arg41;
     uint32_t arg5;
     uint32_t arg51;
+    uint64_t pad[6];
   };
 
   // Reference CPU implementation of Simple Convolution