P4 to Git Change 1175317 by gandryey@gera-dev-w7 on 2015/07/29 17:42:25

ECR #304775 - Remove obsolete functions

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudevice.cpp#515 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/GSLDevice.cpp#127 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/GSLDevice.h#51 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/GSLDeviceLinux.cpp#2 delete
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/GSLDeviceWin.cpp#5 delete
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/backend.cpp#13 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/backend.h#6 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/build/Makefile.backend#8 edit


[ROCm/clr commit: f48633c15c]

projects/clr/rocclr/runtime/device/gpu/gpudevice.cpp

@@ -1251,7 +1251,7 @@ Device::init()
    }
 #endif // _WIN32 & DEBUG
 
-    calInit();
+    gslInit();
 
 #if defined(_WIN32) && !defined(_WIN64)
     _controlfp_s(&ignored, old, _MCW_RC | _MCW_PC);
@@ -1259,7 +1259,7 @@ Device::init()
 
     // Get the total number of active devices
     // Count up all the devices in the system.
-    numDevices = calGetDeviceCount();
+    numDevices = gsAdaptor::enumerateAdaptors();
 
     CALuint ordinal = 0;
     const char* selectDeviceByName = NULL;
@@ -1295,7 +1295,7 @@ void
 Device::tearDown()
 {
     osExit();
-    calShutdown();
+    gslExit();
     aclCompilerFini(compiler_);
     if (hsaCompiler_ != NULL) {
         aclCompilerFini(hsaCompiler_);

projects/clr/rocclr/runtime/device/gpu/gslbe/src/rt/GSLDevice.cpp

@@ -64,7 +64,6 @@ CALGSLDevice::~CALGSLDevice()
         delete static_cast<char*>(m_nativeDisplayHandle);
         break;
     case GSL_DEVICE_MODE_GFX:
-        closeNativeDisplayHandle();
         break;
     }
 }

projects/clr/rocclr/runtime/device/gpu/gslbe/src/rt/GSLDevice.h

@@ -101,8 +101,6 @@ public:
 
     bool             isVmMode() const { return m_vmMode; };
 
-    void             closeNativeDisplayHandle();
-
     uint32           getVPUCount();
     void             setVPUMask(uint32 mask);
     uint32           getVPUMask() const { return m_vpuMask; }

projects/clr/rocclr/runtime/device/gpu/gslbe/src/rt/GSLDeviceLinux.cpp

@@ -1,9 +0,0 @@
-#include <X11/Xlib.h>
-#include "GSLDevice.h"
-#include <stdio.h>
-
-void CALGSLDevice::closeNativeDisplayHandle()
-{
-    //do nothing native handle should be close by lower layers
-}
-

projects/clr/rocclr/runtime/device/gpu/gslbe/src/rt/GSLDeviceWin.cpp

@@ -1,9 +0,0 @@
-#include "gsl_ctx.h"
-#include "GSLDevice.h"
-#include <windows.h>
-
-void CALGSLDevice::closeNativeDisplayHandle()
-{
-    DeleteDC((HDC)m_nativeDisplayHandle);
-    m_nativeDisplayHandle = NULL;
-}

projects/clr/rocclr/runtime/device/gpu/gslbe/src/rt/backend.cpp

@@ -2,15 +2,6 @@
 #include "GSLContext.h"
 #include "backend.h"
 #include "GSLDevice.h"
-
-#include "os_if.h"
-
-#include <stdlib.h>
-
-#ifdef ATI_OS_LINUX
-#include <X11/Xlib.h>
-#endif
-
 #include "amuABI.h"
 
 bool
@@ -184,23 +175,4 @@ getFuncInfoFromImage(CALimage image, CALfuncInfo *pFuncInfo)
     return true;
 }
 
-
 gslMemObjectAttribTiling g_CALBETiling_Tiled  = GSL_MOA_TILING_TILED;
-
-void
-calInit(void)
-{
-    gslInit(); // initialize GSL
-}
-
-void
-calShutdown(void)
-{
-    gslExit();
-}
-
-uint32
-calGetDeviceCount()
-{
-    return gsAdaptor::enumerateAdaptors();
-}

projects/clr/rocclr/runtime/device/gpu/gslbe/src/rt/backend.h

@@ -267,12 +267,4 @@ struct GpuEvent
     void invalidate() { id = InvalidID; }
 };
 
-
-/*
- * GPU Backend functions
- */
-void calInit(void);
-void calShutdown(void);
-uint32 calGetDeviceCount();
-
 #endif