8e1aee62d0
## Motivation Resolved: SWDEV-566226 The current implementation of agents inside of rocprof-systems keeps just the minimal necessary set of information required for populating the `info_agent` table inside of rocpd database. There is a sufficient amount of data that is being left out from database, so this change should fix that and store the additional agent information as an `extdata` row inside of `info_agent` table. ## Technical Details This PR introduces additional filed inside of `agent` structure inside which is representing the JSON formatted string of all the additional information we can acquire about particular agent. This data is processed and added during the initial fetching of agents, and afterwards pushed inside of the database. --------- Co-authored-by: David Galiffi <David.Galiffi@amd.com> * SWDEV-557412 - Incorporate proper chunk offset when remapping virtual memory (#1848) * SWDEV-557412 - Incorporate proper offset when remapping virtual memory * Fix condition to check if VMHeap allocation address matches a chunk address * Move offset calculation outside if/else block --------- Co-authored-by: JeniferC99 <150404595+JeniferC99@users.noreply.github.com> * SWDEV-567852 - Clean-up hip::init() (#1948) * SWDEV-559267 - Use CLPrint to DevLogPrintf with Log Level - detail debug. (#1160) * SWDEV-548892 - Stop using ocml isinf wrapper (#1854) * SWDEV-562708 - change default maximum SVM size to 256GB (#1731) * SWDEV-503089 - Fix and enable disabled HIP tests from math group (#1319) * SWDEV-503089 - Fix and enable disabled HIP tests from math group * SWDEV-503089 - Move single precision reduced run to a common function * SWDEV-548892 - Stop using ockl steadyctr function (#1882) Directly use the builtin * Implement PTL support (#1957) * Implement PTL support Signed-off-by: adapryor <Adam.pryor@amd.com> (cherry picked from commit 45bc31292e7940a3b8fca044ef7df22047b95733) Signed-off-by: Maisam Arif <Maisam.Arif@amd.com> --------- Signed-off-by: adapryor <Adam.pryor@amd.com> Signed-off-by: Maisam Arif <Maisam.Arif@amd.com> Co-authored-by: Maisam Arif <Maisam.Arif@amd.com> * SWDEV-558080 - Add recommended granularity (#1176) * Add recommended granularity * Improve granularity testing * Update based on feedback * Fix and enable VMM tests on cuda (#1855) * Fix and enable VMM tests on cuda * Minor syntax fixes --------- Co-authored-by: Rahul Manocha <rmanocha@amd.com> * [rocprofiler-systems] Add support for ompt_callback_thread_begin (#1681) * Add thread_begin callback * Make OMPT callbacks that are instant have start_ts = end_ts * SWDEV-567514: Remove default stream wait (#1977) - when virtual map command is called - can create deadlock Signed-off-by: sdashmiz <shadi.dashmiz@amd.com> * Fix flaky test Unit_hipStreamAddCallback_StrmSyncTiming (#2022) * Review comments * skip the 3 failing tests to merge hip-tests rocm-systems PR --------- Signed-off-by: Bindhiya Kanangot Balakrishnan <Bindhiya.KanangotBalakrishnan@amd.com> Signed-off-by: adapryor <Adam.pryor@amd.com> Signed-off-by: Maisam Arif <Maisam.Arif@amd.com> Signed-off-by: sdashmiz <shadi.dashmiz@amd.com> Co-authored-by: GunaShekar <agunashe@amd.com> Co-authored-by: agunashe <ajay.gunashekar@amd.com> Co-authored-by: Ethan Trinh <Ethan.Trinh@amd.com> Co-authored-by: JeniferC99 <150404595+JeniferC99@users.noreply.github.com> Co-authored-by: Victor Zhang <111778801+victzhan@users.noreply.github.com> Co-authored-by: German Andryeyev <56892148+gandryey@users.noreply.github.com> Co-authored-by: usrihari123 <srihari.u@amd.com> Co-authored-by: Bindhiya Kanangot Balakrishnan <Bindhiya.KanangotBalakrishnan@amd.com> Co-authored-by: anujshuk-amd <anujshuk@amd.com> Co-authored-by: itrowbri <Ian.Trowbridge@amd.com> Co-authored-by: marantic-amd <marantic@amd.com> Co-authored-by: David Galiffi <David.Galiffi@amd.com> Co-authored-by: cadolphe-amd <chris.adolphe@amd.com> Co-authored-by: Karthik Jayaprakash <54370791+kjayapra-amd@users.noreply.github.com> Co-authored-by: Matt Arsenault <Matthew.Arsenault@amd.com> Co-authored-by: Todd tiantuo Li <88386084+lttamd@users.noreply.github.com> Co-authored-by: amilanov-amd <Aleksandar.Milanov@amd.com> Co-authored-by: Adam Pryor <61172547+adam360x@users.noreply.github.com> Co-authored-by: Maisam Arif <Maisam.Arif@amd.com> Co-authored-by: AidanBeltonS <abeltons@amd.com> Co-authored-by: Rahul Manocha <153310294+manocharahul@users.noreply.github.com> Co-authored-by: Rahul Manocha <rmanocha@amd.com> Co-authored-by: Kian Cossettini <Kian.Cossettini@amd.com> Co-authored-by: Shadi Dashmiz <94885391+shadidashmiz@users.noreply.github.com> Co-authored-by: Ioannis Assiouras <38722728+iassiour@users.noreply.github.com> Co-authored-by: Ajay GunaShekar <86270081+agunashe@users.noreply.github.com>
280 строки
9.5 KiB
C++
280 строки
9.5 KiB
C++
/*
|
|
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 WARRANTY OF ANY KIND, EXPRESS OR
|
|
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
FITNESS 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 IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
THE SOFTWARE.
|
|
*/
|
|
|
|
#pragma once
|
|
#include <hip/hip_runtime.h>
|
|
#include <hip/hiprtc.h>
|
|
#include <kernel_mapping.hh>
|
|
#include <string>
|
|
#include <vector>
|
|
#include <iostream>
|
|
#include <fstream>
|
|
#include <sstream>
|
|
#include <set>
|
|
#include <mutex>
|
|
#include "hip/hip_runtime_api.h"
|
|
#include "hip_test_context.hh"
|
|
|
|
#define STRINGIFY(x) #x
|
|
namespace HipTest {
|
|
|
|
struct KernelArgument {
|
|
const void* ptr;
|
|
size_t sizeRequirement;
|
|
size_t alignmentRequirement;
|
|
};
|
|
|
|
/**
|
|
* @brief Reconstructs the name expression for the kernel.
|
|
*
|
|
* @param kernelName the name of the kernel (e.g. "HipTest::VectorADD")
|
|
* @param typenames the typenames used by this kernel (e.g. "float").
|
|
* @return std::string the reconstructed expression (e.g. "VectorADD<float>""). Returns kernelName
|
|
* instead if the kernel is not a template.
|
|
*/
|
|
inline std::string reconstructExpression(std::string& kernelName,
|
|
std::vector<std::string>& typenames) {
|
|
std::string kernelExpression = kernelName;
|
|
if (typenames.size() > 0) {
|
|
kernelExpression += "<" + typenames[0];
|
|
for (size_t i = 1; i < typenames.size(); ++i) {
|
|
kernelExpression += "," + typenames[i];
|
|
}
|
|
kernelExpression += ">";
|
|
}
|
|
|
|
return kernelExpression;
|
|
}
|
|
|
|
/**
|
|
* @brief Packs the kernel arguments into the format expected by hipModuleLaunchKernel
|
|
*
|
|
* @param args list of arguments for the kernel and their alignemnt requirements.
|
|
* @return std::vector<char> the packed arguments ready to be passed on to hipModuleLaunchKernel
|
|
*/
|
|
inline std::vector<char> alignArguments(std::vector<KernelArgument>& args) {
|
|
std::vector<char> alignedArguments{};
|
|
int count = 0;
|
|
for (auto& arg : args) {
|
|
const char* argPtr{reinterpret_cast<const char*>(arg.ptr)};
|
|
|
|
int paddingNeeded = (arg.alignmentRequirement - 1) & (~count + 1);
|
|
alignedArguments.insert(std::end(alignedArguments), paddingNeeded, 0);
|
|
count += paddingNeeded;
|
|
|
|
alignedArguments.insert(std::end(alignedArguments), argPtr, argPtr + arg.sizeRequirement);
|
|
count += arg.sizeRequirement;
|
|
}
|
|
return alignedArguments;
|
|
}
|
|
|
|
inline std::vector<char> getKernelCode(hiprtcProgram& rtcProgram) {
|
|
size_t codeSize;
|
|
REQUIRE(HIPRTC_SUCCESS == hiprtcGetCodeSize(rtcProgram, &codeSize));
|
|
|
|
std::vector<char> code(codeSize);
|
|
REQUIRE(HIPRTC_SUCCESS == hiprtcGetCode(rtcProgram, code.data()));
|
|
|
|
return code;
|
|
}
|
|
|
|
/**
|
|
* @brief Compiles a kernel using HIP RTC
|
|
*
|
|
* @param rtcKernel the name of the kernel to compile.
|
|
* @param kernelNameExpression the name expression to be added to the RTC program (e.g.
|
|
* HipTest::VectorADD<float>)
|
|
* @return hiprtcProgram the compiled rtc program.
|
|
*/
|
|
inline hiprtcProgram compileRTC(std::string& rtcKernel, std::string& kernelNameExpression) {
|
|
std::string fileName = mapKernelToFileName.at(rtcKernel);
|
|
std::string filePath{STRINGIFY(KERNELS_PATH) + fileName};
|
|
|
|
INFO("Opening Kernel File: " << filePath);
|
|
std::ifstream kernelFile{filePath};
|
|
REQUIRE(kernelFile.is_open());
|
|
|
|
std::stringstream stringStream;
|
|
std::string line;
|
|
while (getline(kernelFile, line)) {
|
|
/* Skip the include directive since it is not part of the kernel */
|
|
if (line.find("#include") != std::string::npos) {
|
|
continue;
|
|
}
|
|
stringStream << line << '\n';
|
|
}
|
|
kernelFile.close();
|
|
|
|
std::string kernelCode{stringStream.str()};
|
|
INFO("RTC Kernel Code:\n" << kernelCode);
|
|
|
|
hiprtcProgram rtcProgram;
|
|
hiprtcCreateProgram(&rtcProgram, kernelCode.c_str(), (fileName + ".cu").c_str(), 0, nullptr,
|
|
nullptr);
|
|
|
|
std::vector<const char*> options{};
|
|
#ifdef __HIP_PLATFORM_AMD__
|
|
|
|
int deviceCount;
|
|
REQUIRE(hipSuccess == hipGetDeviceCount(&deviceCount));
|
|
|
|
std::set<std::string> architectures{};
|
|
for (int i = 0; i < deviceCount; ++i) {
|
|
hipDeviceProp_t props;
|
|
REQUIRE(hipSuccess == hipGetDeviceProperties(&props, i));
|
|
architectures.insert(std::string{"--gpu-architecture="} + props.gcnArchName);
|
|
}
|
|
|
|
for (auto& architecture : architectures) {
|
|
options.push_back(architecture.c_str());
|
|
}
|
|
#else
|
|
options.push_back("--fmad=false");
|
|
#endif
|
|
|
|
REQUIRE(HIPRTC_SUCCESS == hiprtcAddNameExpression(rtcProgram, kernelNameExpression.c_str()));
|
|
REQUIRE(HIPRTC_SUCCESS == hiprtcCompileProgram(rtcProgram, 1, options.data()));
|
|
|
|
return rtcProgram;
|
|
}
|
|
|
|
/**
|
|
* @brief Get a typename as a string
|
|
*
|
|
* @tparam T The typename
|
|
* @return std::string the string representation of T
|
|
*/
|
|
template <typename T> std::string getTypeName() {
|
|
std::string name, prefix, suffix;
|
|
|
|
|
|
#ifdef __clang__
|
|
name = __PRETTY_FUNCTION__;
|
|
prefix = "std::string HipTest::getTypeName() [T = ";
|
|
suffix = "]";
|
|
#elif defined(__GNUC__)
|
|
name = __PRETTY_FUNCTION__;
|
|
prefix = "std::string HipTest::getTypeName() [with T = ";
|
|
suffix = "; std::string = std::__cxx11::basic_string<char>]";
|
|
#elif defined(_MSC_VER)
|
|
name = __FUNCSIG__;
|
|
prefix = "std::string __cdecl HipTest::getTypeName<";
|
|
suffix = ">(void)";
|
|
#endif
|
|
|
|
return name.substr(prefix.size(), name.rfind(suffix) - prefix.size());
|
|
}
|
|
|
|
/**
|
|
* @brief Tells the user that the kernels are using HIP RTC. Prints only once per test.
|
|
*
|
|
*/
|
|
static inline void printInfo() {
|
|
static bool alreadyPrinted{false};
|
|
|
|
if (!alreadyPrinted) {
|
|
std::cout << "INFO: This test is running using HIP RTC to compile and run the kernels."
|
|
<< std::endl;
|
|
alreadyPrinted = true;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* @brief Compiles and launches a kernel using HIP RTC
|
|
*
|
|
* @tparam Typenames A list of typenames used by the kernel (unused if the kernel is not a
|
|
* template).
|
|
* @tparam Args A list of kernel arguments to be forwarded.
|
|
* @param getKernelName A function wrapper that returns the name of the kernel to launch (check
|
|
* kernels.hh for more info)
|
|
* @param numBlocks
|
|
* @param numThreads
|
|
* @param memPerBlock
|
|
* @param stream
|
|
* @param packedArgs A list of kernel arguments to be forwarded.
|
|
*/
|
|
template <typename... Typenames, typename... Args>
|
|
void launchRTCKernel(std::string (*getKernelName)(), dim3 numBlocks, dim3 numThreads,
|
|
std::uint32_t memPerBlock, hipStream_t stream, Args&&... packedArgs) {
|
|
printInfo();
|
|
TestContext& testContext = TestContext::get();
|
|
std::string kernelName = (*getKernelName)();
|
|
|
|
std::vector<std::string> kernelTypenames{std::string(HipTest::getTypeName<Typenames>())...};
|
|
std::string kernelExpression = reconstructExpression(kernelName, kernelTypenames);
|
|
|
|
static std::mutex mutex{};
|
|
{
|
|
std::lock_guard<std::mutex> lockGuard(mutex);
|
|
if (testContext.getFunction(kernelExpression) == nullptr) {
|
|
hiprtcProgram rtcProgram{compileRTC(kernelName, kernelExpression)};
|
|
std::vector<char> compiledCode{getKernelCode(rtcProgram)};
|
|
|
|
hipModule_t module;
|
|
|
|
REQUIRE(hipSuccess == hipModuleLoadData(&module, compiledCode.data()));
|
|
|
|
hipFunction_t kernelFunction;
|
|
|
|
const char* loweredName;
|
|
REQUIRE(HIPRTC_SUCCESS ==
|
|
hiprtcGetLoweredName(rtcProgram, kernelExpression.c_str(), &loweredName));
|
|
REQUIRE(hipSuccess == hipModuleGetFunction(&kernelFunction, module, loweredName));
|
|
|
|
/* After obtaining the kernelFunction, the program is no longer needed. So it can be destroyed */
|
|
REQUIRE(HIPRTC_SUCCESS == hiprtcDestroyProgram(&rtcProgram));
|
|
|
|
testContext.trackRtcState(kernelExpression, module, kernelFunction);
|
|
}
|
|
}
|
|
|
|
hipFunction_t kernelFunction = testContext.getFunction(kernelExpression);
|
|
|
|
std::vector<KernelArgument> args = {
|
|
{reinterpret_cast<const void*>(&packedArgs), sizeof(Args), alignof(Args)}...};
|
|
|
|
std::vector<char> alignedArguments{alignArguments(args)};
|
|
size_t argumentsSize{alignedArguments.size()};
|
|
|
|
void* config_array[] = {HIP_LAUNCH_PARAM_BUFFER_POINTER, alignedArguments.data(),
|
|
HIP_LAUNCH_PARAM_BUFFER_SIZE, reinterpret_cast<void*>(&argumentsSize),
|
|
HIP_LAUNCH_PARAM_END};
|
|
|
|
REQUIRE(hipSuccess ==
|
|
hipModuleLaunchKernel(kernelFunction, numBlocks.x, numBlocks.y, numBlocks.z, numThreads.x,
|
|
numThreads.y, numThreads.z, memPerBlock, stream, nullptr,
|
|
config_array));
|
|
}
|
|
|
|
/**
|
|
* @brief Template overload for when numBlocks and numThreads is an integer.
|
|
*
|
|
*/
|
|
template <typename... Typenames, typename... Args>
|
|
void launchRTCKernel(std::string kernelName, int numBlocks, int numThreads,
|
|
std::uint32_t memPerBlock, hipStream_t stream, Args&&... packedArgs) {
|
|
launchRTCKernel<Typenames...>(kernelName, dim3(numBlocks), dim3(numThreads), memPerBlock, stream,
|
|
std::forward<Args>(packedArgs)...);
|
|
}
|
|
|
|
} // namespace HipTest
|