GPUOpen-LibrariesAndSDKs
diff --git a/‎.gitattributes
+1 b/‎.gitattributes
+1
diff --git a/‎Orochi/Orochi.cpp
+5 b/‎Orochi/Orochi.cpp
+5
diff --git a/‎Orochi/Orochi.h
+8-1 b/‎Orochi/Orochi.h
+8-1
diff --git a/‎Orochi/OrochiUtils.cpp
-4 b/‎Orochi/OrochiUtils.cpp
-4
diff --git a/‎Orochi/OrochiUtils.h
+15-4 b/‎Orochi/OrochiUtils.h
+15-4
@@ -0,0 +1 @@
+*.dll filter=lfs diff=lfs merge=lfs -text
@@ -569,6 +569,11 @@ oroError OROAPI oroMemAllocPitch(oroDeviceptr* dptr, size_t* pPitch, size_t Widt
 {
 	return oroErrorUnknown;
 }
+oroError OROAPI oroMallocManaged(oroDeviceptr* dptr, size_t bytesize, oroManagedMemoryAttachFlags flags)
+{
+	__ORO_FUNC1( MemAllocManaged((CUdeviceptr*)dptr, bytesize, (CUmemAttach_flags_enum)flags), MallocManaged( dptr, bytesize, (HIPmemAttach_flags_enum)flags ) );
+	return oroErrorUnknown;
+}
 oroError OROAPI oroFree(oroDeviceptr dptr)
 {
 	__ORO_FUNC1( MemFree( dptr ), Free( dptr ) );
 
@@ -496,6 +496,13 @@ typedef enum OROmem_range_attribute_enum {
     ORO_MEM_RANGE_ATTRIBUTE_LAST_PREFETCH_LOCATION = 4,
 } PPmem_range_attribute;
 
+typedef enum oroManagedMemoryAttachFlags
+{
+    oroMemAttachGlobal = 0x1,
+    oroMemAttachHost = 0x2,
+    oroMemAttachSingle = 0x4,
+}oroManagedMemoryAttachFlags;
+
 typedef enum oroJitOption {
     oroJitOptionMaxRegisters = 0,
     oroJitOptionThreadsPerBlock,
@@ -641,6 +648,7 @@ oroError OROAPI oroMemGetInfo(size_t* free, size_t* total);
 oroError OROAPI oroMalloc(oroDeviceptr* dptr, size_t bytesize);
 oroError OROAPI oroMalloc2(oroDeviceptr* dptr, size_t bytesize);
 oroError OROAPI oroMemAllocPitch(oroDeviceptr* dptr, size_t* pPitch, size_t WidthInBytes, size_t Height, unsigned int ElementSizeBytes);
+oroError OROAPI oroMallocManaged(oroDeviceptr* dptr, size_t bytesize, oroManagedMemoryAttachFlags flags);
 oroError OROAPI oroFree(oroDeviceptr dptr);
 oroError OROAPI oroFree2(oroDeviceptr dptr);
 //oroError OROAPI oroMemGetAddressRange(oroDeviceptr* pbase, size_t* psize, oroDeviceptr dptr);
@@ -650,7 +658,6 @@ oroError OROAPI oroFree2(oroDeviceptr dptr);
 oroError OROAPI oroHostRegister(void* p, size_t bytesize, unsigned int Flags);
 oroError OROAPI oroHostGetDevicePointer(oroDeviceptr* pdptr, void* p, unsigned int Flags);
 //oroError OROAPI oroHostGetFlags(unsigned int* pFlags, void* p);
-//oroError OROAPI oroMallocManaged(oroDeviceptr* dptr, size_t bytesize, unsigned int flags);
 //oroError OROAPI oroDeviceGetByPCIBusId(hipDevice_t* dev, const char* pciBusId);
 //oroError OROAPI oroDeviceGetPCIBusId(char* pciBusId, int len, hipDevice_t dev);
 oroError OROAPI oroHostUnregister(void* p);
 
@@ -374,10 +374,6 @@ struct OrochiUtilsImpl
 	static std::string getCacheName( const std::string& path, const std::string& kernelname ) noexcept { return path + kernelname; }
 };
 
-OrochiUtils::OrochiUtils() { m_cacheDirectory = "./cache/"; }
-
-OrochiUtils::~OrochiUtils() {}
-
 bool OrochiUtils::readSourceCode( const std::string& path, std::string& sourceCode, std::vector<std::string>* includes ) { return OrochiUtilsImpl::readSourceCode( path, sourceCode, includes ); }
 
 oroFunction OrochiUtils::getFunctionFromFile( oroDevice device, const char* path, const char* funcName, std::vector<const char*>* optsIn )
 
@@ -33,8 +33,12 @@ class OrochiUtils
 		int x, y, z, w;
 	};
 
-	OrochiUtils();
-	~OrochiUtils();
+	OrochiUtils() = default;
+	OrochiUtils(const OrochiUtils&) = delete; 
+    OrochiUtils& operator=(const OrochiUtils&) = delete;
+    OrochiUtils(OrochiUtils&&) = delete; 
+    OrochiUtils& operator=(OrochiUtils&&) = delete;
+	~OrochiUtils() = default;
 
 	oroFunction getFunctionFromPrecompiledBinary( const std::string& path, const std::string& funcName );
 
@@ -50,12 +54,19 @@ class OrochiUtils
 	static void launch2D( oroFunction func, int nx, int ny, const void** args, int wgSizeX = 8, int wgSizeY = 8, unsigned int sharedMemBytes = 0, oroStream stream = 0 );
 
 	template<typename T>
-	static void malloc( T*& ptr, int n )
+	static void malloc( T*& ptr, size_t n )
 	{
 		oroError e = oroMalloc( (oroDeviceptr*)&ptr, sizeof( T ) * n );
 		OROASSERT( e == oroSuccess, 0 );
 	}
 
+	template<typename T>
+	static void mallocManaged( T*& ptr, size_t n, oroManagedMemoryAttachFlags flags )
+	{
+		oroError e = oroMallocManaged( (oroDeviceptr*)&ptr, sizeof( T ) * n, flags );
+		OROASSERT( e == oroSuccess, 0 );
+	}
+
 	template<typename T>
 	static void free( T* ptr )
 	{
@@ -123,7 +134,7 @@ class OrochiUtils
 	}
 
   public:
-	std::string m_cacheDirectory;
+	std::string m_cacheDirectory = "./cache/";
 	std::recursive_mutex m_mutex;
 	std::unordered_map<std::string, oroFunction> m_kernelMap;
 };
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+*.dll filter=lfs diff=lfs merge=lfs -text`
Original file line number	Diff line number	Diff line change
`@@ -569,6 +569,11 @@ oroError OROAPI oroMemAllocPitch(oroDeviceptr* dptr, size_t* pPitch, size_t Widt`
`569`	`569`	`{`
`570`	`570`	`return oroErrorUnknown;`
`571`	`571`	`}`
	`572`	`+oroError OROAPI oroMallocManaged(oroDeviceptr* dptr, size_t bytesize, oroManagedMemoryAttachFlags flags)`
	`573`	`+{`
	`574`	`+ __ORO_FUNC1( MemAllocManaged((CUdeviceptr*)dptr, bytesize, (CUmemAttach_flags_enum)flags), MallocManaged( dptr, bytesize, (HIPmemAttach_flags_enum)flags ) );`
	`575`	`+ return oroErrorUnknown;`
	`576`	`+}`
`572`	`577`	`oroError OROAPI oroFree(oroDeviceptr dptr)`
`573`	`578`	`{`
`574`	`579`	`__ORO_FUNC1( MemFree( dptr ), Free( dptr ) );`