From a1481d542baf8d231eef4516c2fc97f159696123 Mon Sep 17 00:00:00 2001 From: ROCm CI Service Account <66695075+rocm-ci@users.noreply.github.com> Date: Tue, 27 Sep 2022 13:34:31 +0530 Subject: [PATCH] SWDEV-306122 - [catch2][dtest] Added test for hipGraphMemcpyNodeSetParamsToSymbol API (#2813) Change-Id: I486030661324f3fa4d6f6241882f4cd839211511 --- .../config/config_amd_windows_common.json | 4 +- .../hipGraphMemcpyNodeSetParamsToSymbol.cc | 163 +++++++++++++++++- 2 files changed, 163 insertions(+), 4 deletions(-) diff --git a/tests/catch/hipTestMain/config/config_amd_windows_common.json b/tests/catch/hipTestMain/config/config_amd_windows_common.json index f65e58c65a..3461db9bbe 100644 --- a/tests/catch/hipTestMain/config/config_amd_windows_common.json +++ b/tests/catch/hipTestMain/config/config_amd_windows_common.json @@ -69,6 +69,8 @@ "Unit_hipGraphHostNodeGetParams_BasicFunc", "Unit_hipGraphHostNodeGetParams_SetParams", "Unit_hipGraphExecChildGraphNodeSetParams_BasicFunc", - "Unit_hipGraphExecChildGraphNodeSetParams_ChildTopology" + "Unit_hipGraphExecChildGraphNodeSetParams_ChildTopology", + "Unit_hipGraphMemcpyNodeSetParams1D_Functional", + "Unit_hipGraphMemcpyNodeSetParamsToSymbol_Functional" ] } diff --git a/tests/catch/unit/graph/hipGraphMemcpyNodeSetParamsToSymbol.cc b/tests/catch/unit/graph/hipGraphMemcpyNodeSetParamsToSymbol.cc index 804c502a0c..2e30ce00f7 100644 --- a/tests/catch/unit/graph/hipGraphMemcpyNodeSetParamsToSymbol.cc +++ b/tests/catch/unit/graph/hipGraphMemcpyNodeSetParamsToSymbol.cc @@ -1,3 +1,41 @@ +/* +Copyright (c) 2022 Advanced Micro Devices, Inc. All rights reserved. +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANNTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER INN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR INN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. +*/ + +/** +Testcase Scenarios of hipGraphMemcpyNodeSetParamsToSymbol API: +Functional : +1) Allocate global symbol memory, add the node to the graph. + Set/Update the new values to the node. Make sure they are taking effect. +2) Allocate const symbol memory, add the node to the graph. + Set/Update the new values to the node. Make sure they are taking effect. +Negative : +1) Pass GraphNode as nullptr and check if api returns error. +2) Pass symbol ptr as nullptr, api expected to return error code. +3) Pass src ptr as nullptr, api expected to return error code. +4) Pass count as zero, api expected to return error code. +5) Pass count more than allocated size for source and destination ptr, api should return error code. +6) Pass offset+count greater than allocated size, api expected to return error code. +7) Pass same pointer as source ptr and symbol ptr, api expected to return error code. +8) Pass both destination ptr and source ptr as 2 different symbol ptr, api expected to return error code. +9) Copy from host ptr to device ptr but pass kind as different, api expected to return error code. +*/ + #include #include #include @@ -6,6 +44,17 @@ __device__ int globalIn[SIZE], globalOut[SIZE]; __device__ __constant__ int globalConst[SIZE]; +__global__ void CpyToSymbolKernel(int* B_d) { + for (int i = 0 ; i < SIZE; i++) { + B_d[i] = globalIn[i]; + } +} + +__global__ void CpyToConstSymbolKernel(int* B_d) { + for (int i = 0 ; i < SIZE; i++) { + B_d[i] = globalConst[i]; + } +} /* This testcase verifies negative scenarios of hipGraphMemcpyNodeSetParamsToSymbol API */ @@ -33,7 +82,6 @@ TEST_CASE("Unit_hipGraphMemcpyNodeSetParamsToSymbol_Negative") { HIP_SYMBOL(globalIn), A_d, Nbytes, 0, hipMemcpyDeviceToDevice)); - SECTION("Pass GraphNode as nullptr") { ret = hipGraphMemcpyNodeSetParamsToSymbol(nullptr, HIP_SYMBOL(globalIn), @@ -62,7 +110,6 @@ TEST_CASE("Unit_hipGraphMemcpyNodeSetParamsToSymbol_Negative") { hipMemcpyDeviceToDevice); REQUIRE(hipErrorInvalidValue == ret); } - SECTION("Pass count more than allocated size for source and dstn ptr") { ret = hipGraphMemcpyNodeSetParamsToSymbol(memcpyToSymbolNode, HIP_SYMBOL(globalIn), @@ -104,4 +151,114 @@ TEST_CASE("Unit_hipGraphMemcpyNodeSetParamsToSymbol_Negative") { HipTest::freeArrays(A_d, B_d, nullptr, A_h, B_h, nullptr, false); HIP_CHECK(hipGraphDestroy(graph)); -} \ No newline at end of file +} + +static +void hipGraphMemcpyNodeSetParamsToSymbol_GlobalMem(bool useConstDeviceVar) { + constexpr size_t Nbytes = SIZE * sizeof(int); + constexpr auto blocksPerCU = 6; // to hide latency + constexpr auto threadsPerBlock = 256; + unsigned blocks = HipTest::setNumBlocks(blocksPerCU, threadsPerBlock, SIZE); + hipGraphNode_t memcpytosymbolkernel, memcpyD2H_B; + hipKernelNodeParams kernelNodeParams{}; + int *A_d{nullptr}, *B_d{nullptr}, *C_d{nullptr}; + int *A_h{nullptr}, *B_h{nullptr}; + HipTest::initArrays(&A_d, &B_d, &C_d, + &A_h, &B_h, nullptr, SIZE, false); + + hipGraph_t graph; + hipGraphExec_t graphExec; + hipGraphNode_t memcpyToSymbolNode, memcpyH2D_A; + std::vector dependencies; + HIP_CHECK(hipGraphCreate(&graph, 0)); + + // Adding MemcpyNode + HIP_CHECK(hipGraphAddMemcpyNode1D(&memcpyH2D_A, graph, nullptr, 0, A_d, A_h, + Nbytes, hipMemcpyHostToDevice)); + dependencies.push_back(memcpyH2D_A); + + if (useConstDeviceVar) { + HIP_CHECK(hipGraphAddMemcpyNodeToSymbol(&memcpyToSymbolNode, graph, + dependencies.data(), + dependencies.size(), + HIP_SYMBOL(globalConst), + C_d, Nbytes, 0, + hipMemcpyDeviceToDevice)); + } else { + HIP_CHECK(hipGraphAddMemcpyNodeToSymbol(&memcpyToSymbolNode, graph, + dependencies.data(), + dependencies.size(), + HIP_SYMBOL(globalIn), + C_d, Nbytes, 0, + hipMemcpyDeviceToDevice)); + } + dependencies.clear(); + dependencies.push_back(memcpyToSymbolNode); + + // Update the node with source pointer from C_d to A_d + if (useConstDeviceVar) { + HIP_CHECK(hipGraphMemcpyNodeSetParamsToSymbol(memcpyToSymbolNode, + HIP_SYMBOL(globalConst), A_d, + Nbytes, 0, + hipMemcpyDeviceToDevice)); + } else { + HIP_CHECK(hipGraphMemcpyNodeSetParamsToSymbol(memcpyToSymbolNode, + HIP_SYMBOL(globalIn), A_d, + Nbytes, 0, + hipMemcpyDeviceToDevice)); + } + + // Adding Kernel node + void* kernelArgs1[] = {&B_d}; + if (useConstDeviceVar) + kernelNodeParams.func = reinterpret_cast(CpyToConstSymbolKernel); + else + kernelNodeParams.func = reinterpret_cast(CpyToSymbolKernel); + kernelNodeParams.gridDim = dim3(blocks); + kernelNodeParams.blockDim = dim3(threadsPerBlock); + kernelNodeParams.sharedMemBytes = 0; + kernelNodeParams.kernelParams = reinterpret_cast(kernelArgs1); + kernelNodeParams.extra = nullptr; + HIP_CHECK(hipGraphAddKernelNode(&memcpytosymbolkernel, graph, + dependencies.data(), dependencies.size(), + &kernelNodeParams)); + dependencies.clear(); + dependencies.push_back(memcpytosymbolkernel); + + // Adding MemcpyNode + HIP_CHECK(hipGraphAddMemcpyNode1D(&memcpyD2H_B, graph, dependencies.data(), + dependencies.size(), B_h, B_d, + Nbytes, hipMemcpyDeviceToHost)); + + // Instantiate and launch the graph + HIP_CHECK(hipGraphInstantiate(&graphExec, graph, nullptr, nullptr, 0)); + HIP_CHECK(hipGraphLaunch(graphExec, 0)); + + // Validating the result + for (int i = 0; i < SIZE; i++) { + if (B_h[i] != A_h[i]) { + WARN("Validation failed B_h[i] " << B_h[i] << "A_h[i] " << A_h[i]); + REQUIRE(false); + } + } + + HipTest::freeArrays(A_d, B_d, C_d, + A_h, B_h, nullptr, false); + HIP_CHECK(hipGraphExecDestroy(graphExec)); + HIP_CHECK(hipGraphDestroy(graph)); +} + +/* Test verifies hipGraphMemcpyNodeSetParamsToSymbol API Functional scenario. + 1) Allocate global symbol memory, add node to the graph. + Set/Update the new values to the node. Make sure they are taking effect. + 2) Allocate const symbol memory, add node to the graph. + Set/Update the new values to the node. Make sure they are taking effect. + */ +TEST_CASE("Unit_hipGraphMemcpyNodeSetParamsToSymbol_Functional") { + SECTION("Check and update with Global Device Symbol Memory") { + hipGraphMemcpyNodeSetParamsToSymbol_GlobalMem(false); + } + SECTION("Check and update with Constant Global Device Symbol Memory") { + hipGraphMemcpyNodeSetParamsToSymbol_GlobalMem(true); + } +}