Change 2068543 by michliao@hliao-dev-11-hip-workspace on 2020/02/10 10:04:50

SWDEV-125823 - Fix the build issue due to API interface change.

        - PR#1625 is temporarily reverted. Revert CL#2064519 correspondingly.

Affected files ...

... //depot/stg/opencl/drivers/opencl/api/hip/hip_platform.cpp#61 edit

Change-Id: I519b11532d7e6fe8cbee41804155cc9ca64e596c

hipamd/vdi/hip_platform.cpp

@@ -626,7 +626,7 @@ hipError_t ihipCreateGlobalVarObj(const char* name, hipModule_t hmod, amd::Memor
 namespace hip_impl {
 
 hipError_t ihipOccupancyMaxActiveBlocksPerMultiprocessor(int* numBlocks,
-                                                         const void* f,
+                                                         hipFunction_t f,
                                                          int  blockSize,
                                                          size_t dynamicSMemSize)
 {
@@ -637,7 +637,7 @@ hipError_t ihipOccupancyMaxActiveBlocksPerMultiprocessor(int* numBlocks,
   //        else interpret as a hip::Function for now.
   hipFunction_t func = PlatformState::instance().getFunc(f, deviceId);
   if (func == nullptr) {
-    func = (hipFunction_t)f;
+    func = f;
   }
   hip::Function* function = hip::Function::asFunction(func);
   if (function == nullptr) {
@@ -685,9 +685,9 @@ hipError_t ihipOccupancyMaxActiveBlocksPerMultiprocessor(int* numBlocks,
 
 extern "C" {
 // FIXME: Need to replace `uint32_t` with `int` finally.
-hipError_t hipOccupancyMaxActiveBlocksPerMultiprocessor(int* numBlocks,
-                                                        const void* f,
-                                                        int  blockSize,
+hipError_t hipOccupancyMaxActiveBlocksPerMultiprocessor(uint32_t* numBlocks,
+                                                        hipFunction_t f,
+                                                        uint32_t  blockSize,
                                                         size_t dynamicSMemSize)
 {
   int NB;
@@ -697,9 +697,9 @@ hipError_t hipOccupancyMaxActiveBlocksPerMultiprocessor(int* numBlocks,
 }
 
 // FIXME: Need to replace `uint32_t` with `int` finally.
-hipError_t hipOccupancyMaxActiveBlocksPerMultiprocessorWithFlags(int* numBlocks,
-                                                                 const void* f,
-                                                                 int  blockSize,
+hipError_t hipOccupancyMaxActiveBlocksPerMultiprocessorWithFlags(uint32_t* numBlocks,
+                                                                 hipFunction_t f,
+                                                                 uint32_t  blockSize,
                                                                  size_t dynamicSMemSize,
                                                                  unsigned int flags)
 {