P4 to Git Change 1464639 by gandryey@gera-w8 on 2017/09/28 15:45:07

SWDEV-79445 - OCL generic changes and code clean-up
	- Remove ENABLE_CAL_SHUTDOWN variable

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/platform/runtime.cpp#37 edit
... //depot/stg/opencl/drivers/opencl/runtime/utils/flags.hpp#281 edit

rocclr/runtime/platform/runtime.cpp

@@ -29,17 +29,6 @@
 
 namespace amd {
 
-#ifdef __linux__
-
-static void __runtime_exit() __attribute__((destructor(102)));
-static void __runtime_exit() {
-  if (ENABLE_CAL_SHUTDOWN) {
-    Runtime::tearDown();
-  }
-}
-
-#endif
-
 volatile bool Runtime::initialized_ = false;
 
 bool Runtime::init() {
@@ -129,9 +118,6 @@ extern "C" BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID reserved) {
 #endif  // DEBUG
       break;
     case DLL_PROCESS_DETACH:
-      if (!reserved || ENABLE_CAL_SHUTDOWN) {
-        Runtime::tearDown();
-      }
       break;
     case DLL_THREAD_DETACH: {
       amd::Thread* thread = amd::Thread::current();

rocclr/runtime/utils/flags.hpp

@@ -64,8 +64,6 @@ release(bool, GPU_FLUSH_ON_EXECUTION, false,                                  \
         "Submit commands to HW on every operation. 0 - Disable, 1 - Enable")  \
 release(bool, GPU_USE_SYNC_OBJECTS, true,                                     \
         "If enabled, use sync objects instead of polling")                    \
-release(bool, ENABLE_CAL_SHUTDOWN, false,                                     \
-        "Enable explicit CAL shutdown (for PM4 capture)")                     \
 release(bool, CL_KHR_FP64, true,                                              \
         "Enable/Disable support for double precision")                        \
 release(cstring, AMD_OCL_BUILD_OPTIONS, 0,                                    \