From 02cb47edd1d5ab1d8fd226f09bb80e44ffe7bfac Mon Sep 17 00:00:00 2001 From: foreman Date: Thu, 2 Jun 2016 13:36:39 -0400 Subject: [PATCH] P4 to Git Change 1275679 by jatang@jatang-ocl-lnx2 on 2016/06/02 11:53:13 SWDEV-92067 - Support app profiles on Brahma. The Brahma kernel driver does not support parsing the app profile blob files, and does not have ADL. OGL has a library that reads and parses the blob file directly. This CL imports the OGL library into OCL runtime. Affected files ... ... //depot/stg/opencl/drivers/opencl/appprofiles/brahma/apl.cpp#1 add ... //depot/stg/opencl/drivers/opencl/appprofiles/brahma/apl.hpp#1 add ... //depot/stg/opencl/drivers/opencl/appprofiles/brahma/aplexport.cpp#1 add ... //depot/stg/opencl/drivers/opencl/appprofiles/brahma/structanddefines.hpp#1 add ... //depot/stg/opencl/drivers/opencl/runtime/build/Makefile.runtime#63 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/appprofile.cpp#12 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/appprofile.hpp#9 edit [ROCm/clr commit: 428dfba8795567d8cd3463fc24659047ee760fec] --- .../clr/rocclr/runtime/device/appprofile.cpp | 60 ++++++++++++++++++- .../clr/rocclr/runtime/device/appprofile.hpp | 38 ------------ 2 files changed, 57 insertions(+), 41 deletions(-) diff --git a/projects/clr/rocclr/runtime/device/appprofile.cpp b/projects/clr/rocclr/runtime/device/appprofile.cpp index e2a962c661..a9e686f9ad 100644 --- a/projects/clr/rocclr/runtime/device/appprofile.cpp +++ b/projects/clr/rocclr/runtime/device/appprofile.cpp @@ -6,8 +6,13 @@ #include "os/os.hpp" #include "utils/flags.hpp" #include "appprofile.hpp" +#include "adl.h" #include +#ifdef BRAHMA +extern int SearchProfileOfAnApplication(const wchar_t* fileName, ADLApplicationProfile ** lppProfile); +#endif //BRAHMA + static void* __stdcall adlMallocCallback(int n) { return malloc(n); @@ -17,6 +22,44 @@ static void* __stdcall adlMallocCallback(int n) namespace amd { +#ifndef BRAHMA + +class ADL { +public: + ADL(); + ~ADL(); + + bool init(); + + void* adlHandle() const { return adlHandle_; }; + ADL_CONTEXT_HANDLE adlContext() const { return adlContext_; } + + typedef int (*Adl2MainControlCreate)(ADL_MAIN_MALLOC_CALLBACK callback, + int iEnumConnectedAdapters, + ADL_CONTEXT_HANDLE* context); + typedef int (*Adl2MainControlDestroy)(ADL_CONTEXT_HANDLE context); + typedef int (*Adl2ConsoleModeFileDescriptorSet)(ADL_CONTEXT_HANDLE context, int fileDescriptor); + typedef int (*Adl2MainControlRefresh)(ADL_CONTEXT_HANDLE context); + typedef int (*Adl2ApplicationProfilesSystemReload)(ADL_CONTEXT_HANDLE context); + typedef int (*Adl2ApplicationProfilesProfileOfApplicationx2Search)(ADL_CONTEXT_HANDLE context, + const wchar_t* fileName, + const wchar_t* path, + const wchar_t* version, + const wchar_t* appProfileArea, + ADLApplicationProfile** lppProfile); + + Adl2MainControlCreate adl2MainControlCreate; + Adl2MainControlDestroy adl2MainControlDestroy; + Adl2ConsoleModeFileDescriptorSet adl2ConsoleModeFileDescriptorSet; + Adl2MainControlRefresh adl2MainControlRefresh; + Adl2ApplicationProfilesSystemReload adl2ApplicationProfilesSystemReload; + Adl2ApplicationProfilesProfileOfApplicationx2Search adl2ApplicationProfilesProfileOfApplicationx2Search; + +private: + void* adlHandle_; + ADL_CONTEXT_HANDLE adlContext_; +}; + ADL::ADL() : adlHandle_(NULL), adlContext_(NULL) { @@ -86,6 +129,8 @@ bool ADL::init() return true; } +#endif //BRAHMA + AppProfile::AppProfile(): hsaDeviceHint_(0), gpuvmHighAddr_(false), noHsaInit_(false), @@ -151,6 +196,9 @@ cl_device_type AppProfile::ApplyHsaDeviceHintFlag(const cl_device_type& type) bool AppProfile::ParseApplicationProfile() { + ADLApplicationProfile* pProfile = NULL; + +#ifndef BRAHMA amd::ADL* adl = new amd::ADL; if ((adl == NULL) || !adl->init()) { @@ -158,8 +206,6 @@ bool AppProfile::ParseApplicationProfile() return false; } - ADLApplicationProfile* pProfile = NULL; - // Apply blb configurations int result = adl->adl2ApplicationProfilesProfileOfApplicationx2Search( adl->adlContext(), wsAppFileName_.c_str(), NULL, NULL, @@ -167,6 +213,14 @@ bool AppProfile::ParseApplicationProfile() delete adl; +#else //BRAHMA + + if (!SearchProfileOfAnApplication(wsAppFileName_.c_str(), &pProfile)) { + return false; + } + +#endif //BRAHMA + if (pProfile == NULL) { return false; } @@ -199,8 +253,8 @@ bool AppProfile::ParseApplicationProfile() case DataType_String: { assert((size_t)(profileProperty->iDataSize) < sizeof(wbuffer) - 2 && "app profile string too long"); + memset(wbuffer, 0, sizeof(wbuffer)); memcpy(wbuffer, profileProperty->uData, profileProperty->iDataSize); - wbuffer[profileProperty->iDataSize / 2] = L'\0'; size_t len = wcstombs(buffer, wbuffer, sizeof(buffer)); assert(len < sizeof(buffer) - 1 && "app profile string too long"); *(reinterpret_cast(entry->second.data_)) = buffer; diff --git a/projects/clr/rocclr/runtime/device/appprofile.hpp b/projects/clr/rocclr/runtime/device/appprofile.hpp index c2a04367fc..cfb9769b28 100644 --- a/projects/clr/rocclr/runtime/device/appprofile.hpp +++ b/projects/clr/rocclr/runtime/device/appprofile.hpp @@ -4,49 +4,11 @@ #ifndef APPPROFILE_HPP_ #define APPPROFILE_HPP_ -#include "adl.h" - #include #include namespace amd { -class ADL { -public: - ADL(); - ~ADL(); - - bool init(); - - void* adlHandle() const { return adlHandle_; }; - ADL_CONTEXT_HANDLE adlContext() const { return adlContext_; } - - typedef int (*Adl2MainControlCreate)(ADL_MAIN_MALLOC_CALLBACK callback, - int iEnumConnectedAdapters, - ADL_CONTEXT_HANDLE* context); - typedef int (*Adl2MainControlDestroy)(ADL_CONTEXT_HANDLE context); - typedef int (*Adl2ConsoleModeFileDescriptorSet)(ADL_CONTEXT_HANDLE context, int fileDescriptor); - typedef int (*Adl2MainControlRefresh)(ADL_CONTEXT_HANDLE context); - typedef int (*Adl2ApplicationProfilesSystemReload)(ADL_CONTEXT_HANDLE context); - typedef int (*Adl2ApplicationProfilesProfileOfApplicationx2Search)(ADL_CONTEXT_HANDLE context, - const wchar_t* fileName, - const wchar_t* path, - const wchar_t* version, - const wchar_t* appProfileArea, - ADLApplicationProfile** lppProfile); - - Adl2MainControlCreate adl2MainControlCreate; - Adl2MainControlDestroy adl2MainControlDestroy; - Adl2ConsoleModeFileDescriptorSet adl2ConsoleModeFileDescriptorSet; - Adl2MainControlRefresh adl2MainControlRefresh; - Adl2ApplicationProfilesSystemReload adl2ApplicationProfilesSystemReload; - Adl2ApplicationProfilesProfileOfApplicationx2Search adl2ApplicationProfilesProfileOfApplicationx2Search; - -private: - void* adlHandle_; - ADL_CONTEXT_HANDLE adlContext_; -}; - class AppProfile { public: AppProfile();