Revert "Fix occupany APIs (#1560)"

This reverts commit 6c5fbf9b4a.

hipamd/tests/src/runtimeApi/module/hipLaunchCooperativeKernel.cpp

@@ -116,7 +116,7 @@ int main() {
 
     dimBlock.x = workgroups[i];
     // Calculate the device occupancy to know how many blocks can be run concurrently
-    hipOccupancyMaxActiveBlocksPerMultiprocessor(&numBlocks,
+    hipOccupancyMaxActiveBlocksPerMultiprocessor(reinterpret_cast<uint32_t*>(&numBlocks),
         test_gws, dimBlock.x * dimBlock.y * dimBlock.z, dimBlock.x * sizeof(long));
 
     dimGrid.x = deviceProp.multiProcessorCount * std::min(numBlocks, 32);

hipamd/tests/src/runtimeApi/module/hipOccupancyMaxActiveBlocksPerMultiprocessor.cpp

@@ -30,6 +30,10 @@ THE SOFTWARE.
 #include "hip/hip_runtime.h"
 #include "test_common.h"
 
+#define fileName "vcpy_kernel.code"
+#define kernel_name "hello_world"
+
+
 __global__ void f1(float *a) { *a = 1.0; }
 
 template <typename T>
@@ -40,15 +44,16 @@ __global__ void f2(T *a) { *a = 1; }
 int main(int argc, char* argv[]) {
 
     // test case for using kernel function pointer
-    int gridSize = 0;
-    int blockSize = 0;
+    uint32_t gridSize = 0;
+    uint32_t blockSize = 0;
     hipOccupancyMaxPotentialBlockSize(&gridSize, &blockSize, f1, 0, 0);
     assert(gridSize != 0 && blockSize != 0);
 
-    int numBlock = 0;
+    uint32_t numBlock = 0;
     hipOccupancyMaxActiveBlocksPerMultiprocessor(&numBlock, f1, blockSize, 0);
     assert(numBlock != 0);
 
+
     // test case for using kernel function pointer with template
     gridSize = 0;
     blockSize = 0;
@@ -59,5 +64,15 @@ int main(int argc, char* argv[]) {
     hipOccupancyMaxActiveBlocksPerMultiprocessor<void(*)(int *)>(&numBlock, f2, blockSize, 0);
     assert(numBlock != 0);
 
+
+    // test case for using kernel with hipFunction_t type
+    numBlock = 0;
+    hipModule_t Module;
+    hipFunction_t Function;
+    HIPCHECK(hipModuleLoad(&Module, fileName));
+    HIPCHECK(hipModuleGetFunction(&Function, Module, kernel_name));
+    HIPCHECK(hipOccupancyMaxActiveBlocksPerMultiprocessor(&numBlock, Function, blockSize, 0));
+    assert(numBlock != 0);
+
     passed();
 }

hipamd/tests/src/runtimeApi/module/hipOccupancyMaxPotentialBlockSize.cpp

@@ -30,16 +30,22 @@ THE SOFTWARE.
 #include "hip/hip_runtime.h"
 #include "test_common.h"
 
+#define fileName "vcpy_kernel.code"
+#define kernel_name "hello_world"
+
+
 __global__ void f1(float *a) { *a = 1.0; }
 
 template <typename T>
 __global__ void f2(T *a) { *a = 1; }
 
+
+
 int main(int argc, char* argv[]) {
 
     // test case for using kernel function pointer 
-    int gridSize = 0;
-    int blockSize = 0;
+    uint32_t gridSize = 0;
+    uint32_t blockSize = 0;
     hipOccupancyMaxPotentialBlockSize(&gridSize, &blockSize, f1, 0, 0);
     assert(gridSize != 0 && blockSize != 0);
 
@@ -49,5 +55,15 @@ int main(int argc, char* argv[]) {
     hipOccupancyMaxPotentialBlockSize<void(*)(int *)>(&gridSize, &blockSize, f2, 0, 0);
     assert(gridSize != 0 && blockSize != 0);
 
+    // test case for using kernel with hipFunction_t type
+    gridSize = 0;
+    blockSize = 0;
+    hipModule_t Module;
+    hipFunction_t Function;
+    HIPCHECK(hipModuleLoad(&Module, fileName));
+    HIPCHECK(hipModuleGetFunction(&Function, Module, kernel_name));
+    HIPCHECK(hipOccupancyMaxPotentialBlockSize(&gridSize, &blockSize, Function, 0, 0));
+    assert(gridSize != 0 && blockSize != 0);
+
     passed();
 }