From 875c0eac0fb2c07a97802d636d61b248bd05b416 Mon Sep 17 00:00:00 2001 From: Mark Searles Date: Thu, 30 Jan 2020 12:36:41 -0800 Subject: [PATCH] Change 2064519 by michliao@hliao-dev-00-hip.rocm-workspace on 2020/01/30 11:34:18 SWDEV-125823 - Fix the build issue due to API interface change. - `hipOccupancyMaxActiveBlocksPerMultiprocessor` interface is revised and the runtime needs updating. Affected files ... ... //depot/stg/opencl/drivers/opencl/api/hip/hip_platform.cpp#60 edit Change-Id: Ia7901b0dbbfd37977ce4adf2ae1a821aba0ac044 [ROCm/clr commit: 657734689d0a12b4075c7360dce6c60de2035852] --- projects/clr/hipamd/vdi/hip_platform.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/projects/clr/hipamd/vdi/hip_platform.cpp b/projects/clr/hipamd/vdi/hip_platform.cpp index b71a2befad..9127ba4ec1 100644 --- a/projects/clr/hipamd/vdi/hip_platform.cpp +++ b/projects/clr/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, - hipFunction_t f, + const void* 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 = f; + func = (hipFunction_t)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(uint32_t* numBlocks, - hipFunction_t f, - uint32_t blockSize, +hipError_t hipOccupancyMaxActiveBlocksPerMultiprocessor(int* numBlocks, + const void* f, + int blockSize, size_t dynamicSMemSize) { int NB; @@ -697,9 +697,9 @@ hipError_t hipOccupancyMaxActiveBlocksPerMultiprocessor(uint32_t* numBlocks, } // FIXME: Need to replace `uint32_t` with `int` finally. -hipError_t hipOccupancyMaxActiveBlocksPerMultiprocessorWithFlags(uint32_t* numBlocks, - hipFunction_t f, - uint32_t blockSize, +hipError_t hipOccupancyMaxActiveBlocksPerMultiprocessorWithFlags(int* numBlocks, + const void* f, + int blockSize, size_t dynamicSMemSize, unsigned int flags) {