From b6c5d7d71b0d1486e5b70d4eb8efdace60bcff45 Mon Sep 17 00:00:00 2001
From: Rahul Garg <rahul.garg@amd.com>
Date: Wed, 8 Aug 2018 22:28:13 +0530
Subject: [PATCH] Clean up module api samples

---
 .../samples/0_Intro/module_api/runKernel.cpp  | 25 +++--------------
 .../0_Intro/module_api_global/runKernel.cpp   | 25 +++--------------
 .../11_texture_driver/texture2dDrv.cpp        | 27 +++----------------
 3 files changed, 10 insertions(+), 67 deletions(-)

diff --git a/hipamd/samples/0_Intro/module_api/runKernel.cpp b/hipamd/samples/0_Intro/module_api/runKernel.cpp
index 129c458dd0..ed74a7e4eb 100644
--- a/hipamd/samples/0_Intro/module_api/runKernel.cpp
+++ b/hipamd/samples/0_Intro/module_api/runKernel.cpp
@@ -30,7 +30,7 @@ THE SOFTWARE.
 #define LEN 64
 #define SIZE LEN << 2
 
-#define fileName "vcpy_kernel.code.adipose"
+#define fileName "vcpy_kernel.code"
 #define kernel_name "hello_world"
 
 #define HIP_CHECK(status)                                                                          \
@@ -66,32 +66,13 @@ int main() {
     HIP_CHECK(hipModuleLoad(&Module, fileName));
     HIP_CHECK(hipModuleGetFunction(&Function, Module, kernel_name));
 
-#ifdef __HIP_PLATFORM_HCC__
-    uint32_t len = LEN;
-    uint32_t one = 1;
-
     struct {
         void* _Ad;
         void* _Bd;
     } args;
 
-    args._Ad = Ad;
-    args._Bd = Bd;
-
-#endif
-
-#ifdef __HIP_PLATFORM_NVCC__
-    struct {
-        uint32_t _hidden[1];
-        void* _Ad;
-        void* _Bd;
-    } args;
-
-    args._hidden[0] = 0;
-    args._Ad = Ad;
-    args._Bd = Bd;
-#endif
-
+    args._Ad = (void*) Ad;
+    args._Bd = (void*) Bd;
 
     size_t size = sizeof(args);
 
diff --git a/hipamd/samples/0_Intro/module_api_global/runKernel.cpp b/hipamd/samples/0_Intro/module_api_global/runKernel.cpp
index ebae029a16..0047f79b7f 100644
--- a/hipamd/samples/0_Intro/module_api_global/runKernel.cpp
+++ b/hipamd/samples/0_Intro/module_api_global/runKernel.cpp
@@ -30,7 +30,7 @@ THE SOFTWARE.
 #define LEN 64
 #define SIZE LEN * sizeof(float)
 
-#define fileName "vcpy_kernel.code.adipose"
+#define fileName "vcpy_kernel.code"
 float myDeviceGlobal;
 float myDeviceGlobalArray[16];
 #define HIP_CHECK(cmd)                                                                             \
@@ -79,32 +79,13 @@ int main() {
         myDeviceGlobalArray[i] = i * 1000.0f;
     }
 
-#ifdef __HIP_PLATFORM_HCC__
-    uint32_t len = LEN;
-    uint32_t one = 1;
-
     struct {
         void* _Ad;
         void* _Bd;
     } args;
 
-    args._Ad = Ad;
-    args._Bd = Bd;
-
-#endif
-
-#ifdef __HIP_PLATFORM_NVCC__
-    struct {
-        uint32_t _hidden[1];
-        void* _Ad;
-        void* _Bd;
-    } args;
-
-    args._hidden[0] = 0;
-    args._Ad = Ad;
-    args._Bd = Bd;
-#endif
-
+    args._Ad = (void*) Ad;
+    args._Bd = (void*) Bd;
 
     size_t size = sizeof(args);
 
diff --git a/hipamd/samples/2_Cookbook/11_texture_driver/texture2dDrv.cpp b/hipamd/samples/2_Cookbook/11_texture_driver/texture2dDrv.cpp
index 2485d455ef..385ed4775a 100644
--- a/hipamd/samples/2_Cookbook/11_texture_driver/texture2dDrv.cpp
+++ b/hipamd/samples/2_Cookbook/11_texture_driver/texture2dDrv.cpp
@@ -21,13 +21,13 @@ THE SOFTWARE.
 */
 
 #include "hip/hip_runtime.h"
-#include "hip/hip_runtime_api.h"
+//#include "hip/hip_runtime_api.h"
 #include <iostream>
 #include <fstream>
 #include <vector>
-#include <hip/hip_hcc.h>
+//#include <hip/hip_hcc.h>
 
-#define fileName "tex2dKernel.code.adipose"
+#define fileName "tex2dKernel.code"
 
 texture<float, 2, hipReadModeElementType> tex;
 bool testResult = false;
@@ -87,34 +87,15 @@ bool runTest(int argc, char** argv) {
     float* dData = NULL;
     hipMalloc((void**)&dData, size);
 
-#ifdef __HIP_PLATFORM_HCC__
-
     struct {
         void* _Ad;
         unsigned int _Bd;
         unsigned int _Cd;
     } args;
-    args._Ad = dData;
+    args._Ad = (void*) dData;
     args._Bd = width;
     args._Cd = height;
 
-#endif
-
-#ifdef __HIP_PLATFORM_NVCC__
-    struct {
-        uint32_t _hidden[1];
-        void* _Ad;
-        unsigned int _Bd;
-        unsigned int _Cd;
-    } args;
-
-    args._hidden[0] = 0;
-    args._Ad = dData;
-    args._Bd = width;
-    args._Cd = height;
-#endif
-
-
     size_t sizeTemp = sizeof(args);
 
     void* config[] = {HIP_LAUNCH_PARAM_BUFFER_POINTER, &args, HIP_LAUNCH_PARAM_BUFFER_SIZE,