From c4aa6febe52f06016942e51bb5b50cdbf3b62c01 Mon Sep 17 00:00:00 2001 From: Vladislav Sytchenko Date: Mon, 30 Aug 2021 14:04:35 -0400 Subject: [PATCH] SWDEV-301289 - Treewide macro rename ATI_OS_WIN -> _WIN32 ATI_OS_LINUX -> __linux__ We should not rely on non-standard macros for platform detections. Change-Id: If1d06e2e1187268df62a59609ea5496ab7eb709d --- opencl/amdocl/cl_icd.cpp | 4 +-- opencl/amdocl/cl_lqdflash_amd.cpp | 4 +-- opencl/tests/ocltst/env/Timer.cpp | 20 +++++------ opencl/tests/ocltst/env/Timer.h | 4 +-- opencl/tests/ocltst/env/oclsysinfo.cpp | 2 +- opencl/tests/ocltst/env/ocltst.cpp | 34 +++++++++---------- opencl/tests/ocltst/env/pfm.cpp | 2 +- opencl/tests/ocltst/env/window.cpp | 4 +-- opencl/tests/ocltst/env/window.h | 4 +-- opencl/tests/ocltst/include/OCL/Thread.h | 6 ++-- opencl/tests/ocltst/include/OCLLog.h | 4 +-- opencl/tests/ocltst/include/OCLTestList.h | 4 +-- .../ocltst/module/common/BaseTestImp.cpp | 2 +- .../tests/ocltst/module/common/CMakeLists.txt | 1 - .../tests/ocltst/module/common/OCLTestImp.cpp | 8 ++--- .../tests/ocltst/module/common/OCLThread.cpp | 24 ++++++------- opencl/tests/ocltst/module/common/Timer.cpp | 20 +++++------ opencl/tests/ocltst/module/common/Timer.h | 4 +-- opencl/tests/ocltst/module/dx/TestList.cpp | 4 +-- .../ocltst/module/include/OCLTestListImp.h | 4 +-- .../tests/ocltst/module/include/OclIncludes.h | 2 +- .../ocltst/module/runtime/OCLCreateBuffer.cpp | 4 +-- .../ocltst/module/runtime/OCLCreateImage.cpp | 8 ++--- .../module/runtime/OCLGetQueueThreadID.cpp | 4 +-- .../module/runtime/OCLReadWriteImage.cpp | 2 +- .../ocltst/module/runtime/OCLStablePState.cpp | 4 +-- opencl/tools/cltrace/cltrace.cpp | 2 +- 27 files changed, 92 insertions(+), 93 deletions(-) diff --git a/opencl/amdocl/cl_icd.cpp b/opencl/amdocl/cl_icd.cpp index d9c262446d..2a4f3af135 100644 --- a/opencl/amdocl/cl_icd.cpp +++ b/opencl/amdocl/cl_icd.cpp @@ -134,7 +134,7 @@ cl_icd_dispatch amd::ICDDispatchedObject::icdVendorDispatch_[] = { clSetProgramReleaseCallback, clSetProgramSpecializationConstant }}; -#if defined(ATI_OS_WIN) +#if defined(_WIN32) #include #pragma comment(lib, "shlwapi.lib") @@ -260,7 +260,7 @@ static bool ShouldLoadPlatform() { return shouldLoad; } -#endif // defined(ATI_OS_WIN) +#endif // defined(_WIN32) CL_API_ENTRY cl_int CL_API_CALL clIcdGetPlatformIDsKHR(cl_uint num_entries, cl_platform_id* platforms, diff --git a/opencl/amdocl/cl_lqdflash_amd.cpp b/opencl/amdocl/cl_lqdflash_amd.cpp index a757903dcb..1174da3202 100644 --- a/opencl/amdocl/cl_lqdflash_amd.cpp +++ b/opencl/amdocl/cl_lqdflash_amd.cpp @@ -58,7 +58,7 @@ bool LiquidFlashFile::open() { flags = LF_READ | LF_WRITE; break; } -#ifdef ATI_OS_LINUX +#ifdef __linux__ assert(sizeof(wchar_t) != sizeof(lf_char)); std::string name_char; std::wstring_convert, wchar_t> cv; @@ -130,7 +130,7 @@ bool LiquidFlashFile::transferBlock(bool writeBuffer, void* srcDst, uint64_t buf RUNTIME_ENTRY_RET(cl_file_amd, clCreateSsgFileObjectAMD, (cl_context context, cl_file_flags_amd flags, const wchar_t* file_name, cl_int* errcode_ret)) { -#if WITH_LIQUID_FLASH && defined ATI_OS_LINUX +#if WITH_LIQUID_FLASH && defined __linux__ if (!is_valid(context)) { *not_null(errcode_ret) = CL_INVALID_CONTEXT; LogWarning("invalid parameter \"context\""); diff --git a/opencl/tests/ocltst/env/Timer.cpp b/opencl/tests/ocltst/env/Timer.cpp index 2e8866c7d3..2bda27f8f6 100644 --- a/opencl/tests/ocltst/env/Timer.cpp +++ b/opencl/tests/ocltst/env/Timer.cpp @@ -20,22 +20,22 @@ #include "Timer.h" -#ifdef ATI_OS_WIN +#ifdef _WIN32 #include #endif -#ifdef ATI_OS_LINUX +#ifdef __linux__ #include #endif CPerfCounter::CPerfCounter() : _clocks(0), _start(0) { -#ifdef ATI_OS_WIN +#ifdef _WIN32 QueryPerformanceFrequency((LARGE_INTEGER *)&_freq); #endif -#ifdef ATI_OS_LINUX +#ifdef __linux__ _freq = 1000; #endif } @@ -45,7 +45,7 @@ CPerfCounter::~CPerfCounter() { } void CPerfCounter::Start(void) { -#ifdef ATI_OS_WIN +#ifdef _WIN32 if (_start) { MessageBox(NULL, "Bad Perf Counter Start", "Error", MB_OK); @@ -54,7 +54,7 @@ void CPerfCounter::Start(void) { QueryPerformanceCounter((LARGE_INTEGER *)&_start); #endif -#ifdef ATI_OS_LINUX +#ifdef __linux__ struct timeval s; gettimeofday(&s, 0); @@ -66,7 +66,7 @@ void CPerfCounter::Start(void) { void CPerfCounter::Stop(void) { i64 n; -#ifdef ATI_OS_WIN +#ifdef _WIN32 if (!_start) { MessageBox(NULL, "Bad Perf Counter Stop", "Error", MB_OK); @@ -76,7 +76,7 @@ void CPerfCounter::Stop(void) { QueryPerformanceCounter((LARGE_INTEGER *)&n); #endif -#ifdef ATI_OS_LINUX +#ifdef __linux__ struct timeval s; gettimeofday(&s, 0); @@ -90,7 +90,7 @@ void CPerfCounter::Stop(void) { } void CPerfCounter::Reset(void) { -#ifdef ATI_OS_WIN +#ifdef _WIN32 if (_start) { MessageBox(NULL, "Bad Perf Counter Reset", "Error", MB_OK); exit(0); @@ -100,7 +100,7 @@ void CPerfCounter::Reset(void) { } double CPerfCounter::GetElapsedTime(void) { -#ifdef ATI_OS_WIN +#ifdef _WIN32 if (_start) { MessageBox(NULL, "Trying to get time while still running.", "Error", MB_OK); exit(0); diff --git a/opencl/tests/ocltst/env/Timer.h b/opencl/tests/ocltst/env/Timer.h index 26665a4140..e5d331ccff 100644 --- a/opencl/tests/ocltst/env/Timer.h +++ b/opencl/tests/ocltst/env/Timer.h @@ -21,10 +21,10 @@ #ifndef _TIMER_H_ #define _TIMER_H_ -#ifdef ATI_OS_WIN +#ifdef _WIN32 typedef __int64 i64; #endif -#ifdef ATI_OS_LINUX +#ifdef __linux__ typedef long long i64; #endif diff --git a/opencl/tests/ocltst/env/oclsysinfo.cpp b/opencl/tests/ocltst/env/oclsysinfo.cpp index 9de4c7a1d9..a0ca56bc82 100644 --- a/opencl/tests/ocltst/env/oclsysinfo.cpp +++ b/opencl/tests/ocltst/env/oclsysinfo.cpp @@ -147,7 +147,7 @@ int oclSysInfo(std::string &info_string, bool use_cpu, unsigned dev_id, clGetDeviceInfo(device, CL_DEVICE_BOARD_NAME_AMD, sizeof(c), &c, NULL); sprintf(tmpString, "\tBoard Name: %s\n", c); info_string.append(tmpString); -#if defined(ATI_OS_LINUX) +#if defined(__linux__) cl_device_topology_amd topology; clGetDeviceInfo(device, CL_DEVICE_TOPOLOGY_AMD, sizeof(topology), &topology, NULL); diff --git a/opencl/tests/ocltst/env/ocltst.cpp b/opencl/tests/ocltst/env/ocltst.cpp index 977d4de4cf..d97d220cbc 100644 --- a/opencl/tests/ocltst/env/ocltst.cpp +++ b/opencl/tests/ocltst/env/ocltst.cpp @@ -22,7 +22,7 @@ #include -#ifdef ATI_OS_WIN +#ifdef _WIN32 #include #include "Window.h" @@ -31,7 +31,7 @@ typedef HMODULE ModuleHandle; ///////////////////////////////////////////////////////////////////////////// -#ifdef ATI_OS_LINUX +#ifdef __linux__ #include typedef void* ModuleHandle; #endif @@ -68,7 +68,7 @@ static OCLutil::Lock moduleLock; ///////////////////////////////////////////////////////////////////////////// -#ifdef ATI_OS_WIN +#ifdef _WIN32 static LONG WINAPI xFilter(LPEXCEPTION_POINTERS xEP); void serviceStubCall(); #endif @@ -386,7 +386,7 @@ void App::printOCLinfo(void) { /*----------------------------------------------------- Function to randomize the order in which tests are executed -------------------------------------------------------*/ -#ifdef ATI_OS_WIN +#ifdef _WIN32 #include #endif // void App::SetTestRunOrder(int test_count) @@ -745,7 +745,7 @@ void App::PrintTestOrder(int mod_index) { //! Function that runs all the tests specified in the command-line void App::RunAllTests() { -#ifdef ATI_OS_WIN +#ifdef _WIN32 if (!m_console) m_window = new Window("Test", 100, 100, m_width, m_height, 0); #endif @@ -889,7 +889,7 @@ void App::RunAllTests() { "##teamcity[testSuiteFinished name='ocltst']\n"); } -#ifdef ATI_OS_WIN +#ifdef _WIN32 if (!m_console && m_window) { ((Window*)m_window)->ConsumeEvents(); } @@ -1374,7 +1374,7 @@ void App::ScanForTests() { for (unsigned int i = 0; i < m_paths.size(); i++) { Module mod; -#ifdef ATI_OS_WIN +#ifdef _WIN32 std::string::iterator myIter; myIter = m_paths[i].end(); myIter--; @@ -1382,20 +1382,20 @@ void App::ScanForTests() { mod.hmodule = LoadLibrary(m_paths[i].c_str()); #endif -#ifdef ATI_OS_LINUX +#ifdef __linux__ mod.hmodule = dlopen(m_paths[i].c_str(), RTLD_NOW); #endif if (mod.hmodule == NULL) { fprintf(stderr, "Could not load module: %s\n", m_paths[i].c_str()); -#ifdef ATI_OS_LINUX +#ifdef __linux__ fprintf(stderr, "Error : %s\n", dlerror()); #else #endif } else { mod.name = m_paths[i]; -#ifdef ATI_OS_WIN +#ifdef _WIN32 mod.get_count = (TestCountFuncPtr)GetProcAddress(mod.hmodule, "OCLTestList_TestCount"); mod.get_name = @@ -1409,7 +1409,7 @@ void App::ScanForTests() { mod.get_libname = (TestLibNameFuncPtr)GetProcAddress( mod.hmodule, "OCLTestList_TestLibName"); #endif -#ifdef ATI_OS_LINUX +#ifdef __linux__ mod.get_count = (TestCountFuncPtr)dlsym(mod.hmodule, "OCLTestList_TestCount"); mod.get_name = @@ -1437,15 +1437,15 @@ void App::CleanUp() { if (m_modules[i].cached_test) { delete[] m_modules[i].cached_test; } -#ifdef ATI_OS_WIN +#ifdef _WIN32 FreeLibrary(m_modules[i].hmodule); #endif -#ifdef ATI_OS_LINUX +#ifdef __linux__ dlclose(m_modules[i].hmodule); #endif } -#ifdef ATI_OS_WIN +#ifdef _WIN32 if (m_window) delete m_window; m_window = 0; #endif @@ -1461,7 +1461,7 @@ int main(int argc, char** argv) { // reset optind as we really didn't parse the full command line optind = 1; App app(platform); -#ifdef ATI_OS_WIN +#ifdef _WIN32 // this function is registers windows service routine when ocltst is launched // by the OS on service initialization. On other scenarios, this function does // nothing. @@ -1469,7 +1469,7 @@ int main(int argc, char** argv) { // SetErrorMode(SEM_NOGPFAULTERRORBOX); // const LPTOP_LEVEL_EXCEPTION_FILTER oldFilter = // SetUnhandledExceptionFilter(xFilter); -#endif // ATI_OS_WIN +#endif // _WIN32 #ifdef AUTO_REGRESS try { #endif /* AUTO_REGRESS */ @@ -1490,7 +1490,7 @@ int main(int argc, char** argv) { return 0; } -#ifdef ATI_OS_WIN +#ifdef _WIN32 #include diff --git a/opencl/tests/ocltst/env/pfm.cpp b/opencl/tests/ocltst/env/pfm.cpp index e940dfbe1a..80c0153403 100644 --- a/opencl/tests/ocltst/env/pfm.cpp +++ b/opencl/tests/ocltst/env/pfm.cpp @@ -20,7 +20,7 @@ #include "pfm.h" -#ifdef ATI_OS_WIN +#ifdef _WIN32 #include #endif diff --git a/opencl/tests/ocltst/env/window.cpp b/opencl/tests/ocltst/env/window.cpp index 1f6b669100..094aee10e9 100644 --- a/opencl/tests/ocltst/env/window.cpp +++ b/opencl/tests/ocltst/env/window.cpp @@ -18,7 +18,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#ifdef ATI_OS_WIN +#ifdef _WIN32 #include #include @@ -172,4 +172,4 @@ void Window::ShowImage(unsigned int width, unsigned int height, float* data) { OnPaint(); } -#endif // ATI_OS_WIN +#endif // _WIN32 diff --git a/opencl/tests/ocltst/env/window.h b/opencl/tests/ocltst/env/window.h index 0936c61e7e..ee6474f792 100644 --- a/opencl/tests/ocltst/env/window.h +++ b/opencl/tests/ocltst/env/window.h @@ -21,7 +21,7 @@ #ifndef _WINDOW_H_ #define _WINDOW_H_ -#ifdef ATI_OS_WIN +#ifdef _WIN32 #include #include @@ -50,6 +50,6 @@ class Window { static unsigned int _h; }; -#endif // ATI_OS_WIN +#endif // _WIN32 #endif // _WINDOW_H_ diff --git a/opencl/tests/ocltst/include/OCL/Thread.h b/opencl/tests/ocltst/include/OCL/Thread.h index 23e0ba5399..0f0ac38a8f 100644 --- a/opencl/tests/ocltst/include/OCL/Thread.h +++ b/opencl/tests/ocltst/include/OCL/Thread.h @@ -25,7 +25,7 @@ //! \file Thread.h //! -#ifdef ATI_OS_WIN +#ifdef _WIN32 #ifndef _WIN32_WINNT #define _WIN32_WINNT 0x0501 #endif @@ -86,7 +86,7 @@ class Lock { //! //! System specific synchronization primitive -#ifdef ATI_OS_WIN +#ifdef _WIN32 CRITICAL_SECTION _cs; #else pthread_mutex_t _lock; @@ -131,7 +131,7 @@ class Thread { //! Private data members and methods //! -#ifdef ATI_OS_WIN +#ifdef _WIN32 //! store the handle HANDLE _tid; diff --git a/opencl/tests/ocltst/include/OCLLog.h b/opencl/tests/ocltst/include/OCLLog.h index 1220ac88d7..20671a8633 100644 --- a/opencl/tests/ocltst/include/OCLLog.h +++ b/opencl/tests/ocltst/include/OCLLog.h @@ -21,7 +21,7 @@ #ifndef OCLLOG_H_ #define OCLLOG_H_ -#ifdef ATI_OS_WIN +#ifdef _WIN32 #ifdef OCLTST_LOG_BUILD #define DLLIMPORT __declspec(dllexport) @@ -32,7 +32,7 @@ #else #define DLLIMPORT -#endif // ATI_OS_WIN +#endif // _WIN32 enum oclLoggingLevel { OCLTEST_LOG_ALWAYS, diff --git a/opencl/tests/ocltst/include/OCLTestList.h b/opencl/tests/ocltst/include/OCLTestList.h index 2fe1c395b2..1189d6310d 100644 --- a/opencl/tests/ocltst/include/OCLTestList.h +++ b/opencl/tests/ocltst/include/OCLTestList.h @@ -21,10 +21,10 @@ #ifndef _OCLMODULE_H_ #define _OCLMODULE_H_ -#ifdef ATI_OS_WIN +#ifdef _WIN32 #define OCLLCONV __cdecl #endif -#ifdef ATI_OS_LINUX +#ifdef __linux__ #define OCLLCONV #endif diff --git a/opencl/tests/ocltst/module/common/BaseTestImp.cpp b/opencl/tests/ocltst/module/common/BaseTestImp.cpp index 7815da14a5..c9121088ca 100644 --- a/opencl/tests/ocltst/module/common/BaseTestImp.cpp +++ b/opencl/tests/ocltst/module/common/BaseTestImp.cpp @@ -45,7 +45,7 @@ BaseTestImp::BaseTestImp() _platformIndex = 0; _perfInfo = 0.0f; -#ifdef ATI_OS_LINUX // +#ifdef __linux__ // _useThreads = 0; // disable threads on linux #else _useThreads = 1; // if available on platform diff --git a/opencl/tests/ocltst/module/common/CMakeLists.txt b/opencl/tests/ocltst/module/common/CMakeLists.txt index a4447c6a52..364e789e14 100644 --- a/opencl/tests/ocltst/module/common/CMakeLists.txt +++ b/opencl/tests/ocltst/module/common/CMakeLists.txt @@ -24,7 +24,6 @@ set_target_properties(Common PROPERTIES target_compile_definitions(Common PUBLIC - ATI_OS_LINUX CL_TARGET_OPENCL_VERSION=220) if(OPENGL_FOUND AND GLEW_FOUND) diff --git a/opencl/tests/ocltst/module/common/OCLTestImp.cpp b/opencl/tests/ocltst/module/common/OCLTestImp.cpp index 618437b4d2..29c51276aa 100644 --- a/opencl/tests/ocltst/module/common/OCLTestImp.cpp +++ b/opencl/tests/ocltst/module/common/OCLTestImp.cpp @@ -241,7 +241,7 @@ void OCLTestImp::setOCLWrapper(OCLWrapper* wrapper) { _wrapper = wrapper; } ///////////////////////////////////////////////////////////////////////////// -#ifdef ATI_OS_WIN +#ifdef _WIN32 #include @@ -251,11 +251,11 @@ static int initializeSeed(void) { return (int)val; } -#endif // ATI_OS_WIN +#endif // _WIN32 ///////////////////////////////////////////////////////////////////////////// -#ifdef ATI_OS_LINUX +#ifdef __linux__ #include @@ -265,7 +265,7 @@ static int initializeSeed(void) { return (int)t.tv_usec; } -#endif // ATI_OS_LINUX +#endif // __linux__ ///////////////////////////////////////////////////////////////////////////// // diff --git a/opencl/tests/ocltst/module/common/OCLThread.cpp b/opencl/tests/ocltst/module/common/OCLThread.cpp index dc53868ae8..4bda6a5f0a 100644 --- a/opencl/tests/ocltst/module/common/OCLThread.cpp +++ b/opencl/tests/ocltst/module/common/OCLThread.cpp @@ -26,7 +26,7 @@ #include #include "OCL/Thread.h" -#ifdef ATI_OS_WIN +#ifdef _WIN32 #include #endif @@ -37,7 +37,7 @@ typedef struct __argsToThreadFunc { } argsToThreadFunc; -#ifdef ATI_OS_WIN +#ifdef _WIN32 //! Windows thread callback - invokes the callback set by //! the application in OCLThread constructor unsigned _stdcall win32ThreadFunc(void *args) { @@ -54,7 +54,7 @@ unsigned _stdcall win32ThreadFunc(void *args) { //! Constructor for OCLLock //! OCLutil::Lock::Lock() { -#ifdef ATI_OS_WIN +#ifdef _WIN32 InitializeCriticalSection(&_cs); #else pthread_mutex_init(&_lock, NULL); @@ -66,7 +66,7 @@ OCLutil::Lock::Lock() { //! Destructor for OCLLock //! OCLutil::Lock::~Lock() { -#ifdef ATI_OS_WIN +#ifdef _WIN32 DeleteCriticalSection(&_cs); #else pthread_mutex_destroy(&_lock); @@ -79,7 +79,7 @@ OCLutil::Lock::~Lock() { //! else hold the lock and enter the protected area //! void OCLutil::Lock::lock() { -#ifdef ATI_OS_WIN +#ifdef _WIN32 EnterCriticalSection(&_cs); #else pthread_mutex_lock(&_lock); @@ -93,7 +93,7 @@ void OCLutil::Lock::lock() { //! section as well in this case). //! bool OCLutil::Lock::tryLock() { -#ifdef ATI_OS_WIN +#ifdef _WIN32 return (TryEnterCriticalSection(&_cs) != 0); #else return !((bool)pthread_mutex_trylock(&_lock)); @@ -105,7 +105,7 @@ bool OCLutil::Lock::tryLock() { //! Unlock the lock //! void OCLutil::Lock::unlock() { -#ifdef ATI_OS_WIN +#ifdef _WIN32 LeaveCriticalSection(&_cs); #else pthread_mutex_unlock(&_lock); @@ -117,7 +117,7 @@ void OCLutil::Lock::unlock() { //! Constructor for OCLThread //! OCLutil::Thread::Thread() : _tid(0), _data(0) { -#ifdef ATI_OS_WIN +#ifdef _WIN32 _ID = 0; #else #endif @@ -128,7 +128,7 @@ OCLutil::Thread::Thread() : _tid(0), _data(0) { //! Destructor for OCLLock //! OCLutil::Thread::~Thread() { -#ifdef ATI_OS_WIN +#ifdef _WIN32 CloseHandle(_tid); #else #endif @@ -146,7 +146,7 @@ bool OCLutil::Thread::create(oclThreadFunc func, void *arg) { bool verbose = getenv("VERBOSE") != NULL; -#ifdef ATI_OS_WIN +#ifdef _WIN32 // Setup the callback struct for thread function and pass to the // begin thread routine // xxx The following struct is allocated but never freed!!!! @@ -180,7 +180,7 @@ bool OCLutil::Thread::create(oclThreadFunc func, void *arg) { //! Return the thread ID for the current OCLThread //! unsigned int OCLutil::Thread::getID() { -#ifdef ATI_OS_WIN +#ifdef _WIN32 return GetCurrentThreadId(); // Type cast the thread handle to unsigned in and send it over #else @@ -193,7 +193,7 @@ unsigned int OCLutil::Thread::getID() { //! Wait for this thread to join //! bool OCLutil::Thread::join() { -#ifdef ATI_OS_WIN +#ifdef _WIN32 DWORD rc = WaitForSingleObject(_tid, INFINITE); if (rc == WAIT_FAILED) { diff --git a/opencl/tests/ocltst/module/common/Timer.cpp b/opencl/tests/ocltst/module/common/Timer.cpp index 8339b0054a..a2674ee330 100644 --- a/opencl/tests/ocltst/module/common/Timer.cpp +++ b/opencl/tests/ocltst/module/common/Timer.cpp @@ -20,23 +20,23 @@ #include "Timer.h" -#ifdef ATI_OS_WIN +#ifdef _WIN32 #include #endif -#ifdef ATI_OS_LINUX +#ifdef __linux__ #include #define NANOSECONDS_PER_SEC 1000000000 #endif CPerfCounter::CPerfCounter() : _clocks(0), _start(0) { -#ifdef ATI_OS_WIN +#ifdef _WIN32 QueryPerformanceFrequency((LARGE_INTEGER *)&_freq); #endif -#ifdef ATI_OS_LINUX +#ifdef __linux__ _freq = NANOSECONDS_PER_SEC; #endif } @@ -46,7 +46,7 @@ CPerfCounter::~CPerfCounter() { } void CPerfCounter::Start(void) { -#ifdef ATI_OS_WIN +#ifdef _WIN32 if (_start) { MessageBox(NULL, "Bad Perf Counter Start", "Error", MB_OK); @@ -55,7 +55,7 @@ void CPerfCounter::Start(void) { QueryPerformanceCounter((LARGE_INTEGER *)&_start); #endif -#ifdef ATI_OS_LINUX +#ifdef __linux__ struct timespec s; clock_gettime(CLOCK_MONOTONIC, &s); @@ -67,7 +67,7 @@ void CPerfCounter::Start(void) { void CPerfCounter::Stop(void) { i64 n; -#ifdef ATI_OS_WIN +#ifdef _WIN32 if (!_start) { MessageBox(NULL, "Bad Perf Counter Stop", "Error", MB_OK); @@ -77,7 +77,7 @@ void CPerfCounter::Stop(void) { QueryPerformanceCounter((LARGE_INTEGER *)&n); #endif -#ifdef ATI_OS_LINUX +#ifdef __linux__ struct timespec s; clock_gettime(CLOCK_MONOTONIC, &s); @@ -91,7 +91,7 @@ void CPerfCounter::Stop(void) { } void CPerfCounter::Reset(void) { -#ifdef ATI_OS_WIN +#ifdef _WIN32 if (_start) { MessageBox(NULL, "Bad Perf Counter Reset", "Error", MB_OK); exit(0); @@ -101,7 +101,7 @@ void CPerfCounter::Reset(void) { } double CPerfCounter::GetElapsedTime(void) { -#ifdef ATI_OS_WIN +#ifdef _WIN32 if (_start) { MessageBox(NULL, "Trying to get time while still running.", "Error", MB_OK); exit(0); diff --git a/opencl/tests/ocltst/module/common/Timer.h b/opencl/tests/ocltst/module/common/Timer.h index 26665a4140..e5d331ccff 100644 --- a/opencl/tests/ocltst/module/common/Timer.h +++ b/opencl/tests/ocltst/module/common/Timer.h @@ -21,10 +21,10 @@ #ifndef _TIMER_H_ #define _TIMER_H_ -#ifdef ATI_OS_WIN +#ifdef _WIN32 typedef __int64 i64; #endif -#ifdef ATI_OS_LINUX +#ifdef __linux__ typedef long long i64; #endif diff --git a/opencl/tests/ocltst/module/dx/TestList.cpp b/opencl/tests/ocltst/module/dx/TestList.cpp index f43410bf19..ec3a3fc8df 100644 --- a/opencl/tests/ocltst/module/dx/TestList.cpp +++ b/opencl/tests/ocltst/module/dx/TestList.cpp @@ -23,7 +23,7 @@ // // Includes for tests // -#ifdef ATI_OS_WIN +#ifdef _WIN32 #include "OCLDX11YUY2.h" #endif @@ -38,7 +38,7 @@ static void* dictionary_CreateTestFunc(void) { #define TEST(name) \ { #name, &dictionary_CreateTestFunc < name> } -#ifdef ATI_OS_WIN +#ifdef _WIN32 TestEntry TestList[] = {TEST(OCLDX11YUY2)}; diff --git a/opencl/tests/ocltst/module/include/OCLTestListImp.h b/opencl/tests/ocltst/module/include/OCLTestListImp.h index 3366574599..5a542a302d 100644 --- a/opencl/tests/ocltst/module/include/OCLTestListImp.h +++ b/opencl/tests/ocltst/module/include/OCLTestListImp.h @@ -24,11 +24,11 @@ // // Testing module (plugin) interface forward declarations // -#ifdef ATI_OS_WIN +#ifdef _WIN32 #define OCL_DLLEXPORT __declspec(dllexport) #define OCL_CALLCONV __cdecl #endif -#ifdef ATI_OS_LINUX +#ifdef __linux__ #define OCL_DLLEXPORT #define OCL_CALLCONV #endif diff --git a/opencl/tests/ocltst/module/include/OclIncludes.h b/opencl/tests/ocltst/module/include/OclIncludes.h index c8b3aa1588..1b3dfdac51 100644 --- a/opencl/tests/ocltst/module/include/OclIncludes.h +++ b/opencl/tests/ocltst/module/include/OclIncludes.h @@ -21,7 +21,7 @@ #ifndef _OCL_INCLUDES_H #define _OCL_INCLUDES_H -#ifdef ATI_OS_WIN +#ifdef _WIN32 #define POINTER_64 __ptr64 #include #include "d3d9.h" diff --git a/opencl/tests/ocltst/module/runtime/OCLCreateBuffer.cpp b/opencl/tests/ocltst/module/runtime/OCLCreateBuffer.cpp index 11404a5287..f3d0edb654 100644 --- a/opencl/tests/ocltst/module/runtime/OCLCreateBuffer.cpp +++ b/opencl/tests/ocltst/module/runtime/OCLCreateBuffer.cpp @@ -26,7 +26,7 @@ #include #include -#ifdef ATI_OS_LINUX +#ifdef __linux__ #include #endif @@ -79,7 +79,7 @@ void OCLCreateBuffer::run(void) { _wrapper->clFinish(cmdQueues_[_deviceId]); size_t maxSteps = maxSize_; -#ifdef ATI_OS_LINUX +#ifdef __linux__ long pages = sysconf(_SC_PHYS_PAGES); long page_size = sysconf(_SC_PAGE_SIZE); if (maxSteps > (size_t)(pages * page_size / 2)) { diff --git a/opencl/tests/ocltst/module/runtime/OCLCreateImage.cpp b/opencl/tests/ocltst/module/runtime/OCLCreateImage.cpp index 98a7942ea5..e912fa2875 100644 --- a/opencl/tests/ocltst/module/runtime/OCLCreateImage.cpp +++ b/opencl/tests/ocltst/module/runtime/OCLCreateImage.cpp @@ -25,7 +25,7 @@ #include #include -#ifdef ATI_OS_LINUX +#ifdef __linux__ #include #include #endif @@ -194,7 +194,7 @@ void OCLCreateImage::open(unsigned int test, char *units, double &conversion, if (ImageSizeY >= max2DHeight) { ImageSizeY = max2DHeight - 0x1000; } -#ifdef ATI_OS_LINUX +#ifdef __linux__ // On linux, if the size of total system memory is less than 4GB, // then, we can allocate much smaller image. // TODO, need to find the root cause @@ -289,7 +289,7 @@ void OCLCreateImage::open(unsigned int test, char *units, double &conversion, float *data; size_t ActualImageSizeY = ImageSizeY; size_t maxImageSize = maxSize_; -#ifdef ATI_OS_LINUX +#ifdef __linux__ long pages = sysconf(_SC_PHYS_PAGES); long page_size = sysconf(_SC_PAGE_SIZE); if (maxImageSize > ((size_t)pages * page_size)) { @@ -357,7 +357,7 @@ void OCLCreateImage::open(unsigned int test, char *units, double &conversion, size_t ActualImageSizeZ = ImageSizeZ; size_t maxImageSize = maxSize_; -#ifdef ATI_OS_LINUX +#ifdef __linux__ long pages = sysconf(_SC_PHYS_PAGES); long page_size = sysconf(_SC_PAGE_SIZE); if (maxImageSize > ((size_t)pages * page_size)) { diff --git a/opencl/tests/ocltst/module/runtime/OCLGetQueueThreadID.cpp b/opencl/tests/ocltst/module/runtime/OCLGetQueueThreadID.cpp index c941c0a922..e1b32f4cc7 100644 --- a/opencl/tests/ocltst/module/runtime/OCLGetQueueThreadID.cpp +++ b/opencl/tests/ocltst/module/runtime/OCLGetQueueThreadID.cpp @@ -27,7 +27,7 @@ #include "CL/cl.h" #include "CL/cl_ext.h" -#if !defined(ATI_OS_LINUX) +#if !defined(__linux__) #include "WinBase.h" typedef DWORD(WINAPI* GetThreadId)(__in HANDLE Thread); #endif @@ -63,7 +63,7 @@ void OCLGetQueueThreadID::open(unsigned int test, char* units, static void CL_CALLBACK notify_callback(cl_event event, cl_int event_command_exec_status, void* user_data) { -#if defined(ATI_OS_LINUX) +#if defined(__linux__) pthread_t id = (pthread_t)user_data; pthread_t handle = pthread_self(); #else diff --git a/opencl/tests/ocltst/module/runtime/OCLReadWriteImage.cpp b/opencl/tests/ocltst/module/runtime/OCLReadWriteImage.cpp index 606d7f4b76..e988627a93 100644 --- a/opencl/tests/ocltst/module/runtime/OCLReadWriteImage.cpp +++ b/opencl/tests/ocltst/module/runtime/OCLReadWriteImage.cpp @@ -25,7 +25,7 @@ #include #include -#ifdef ATI_OS_LINUX +#ifdef __linux__ #include #include #endif diff --git a/opencl/tests/ocltst/module/runtime/OCLStablePState.cpp b/opencl/tests/ocltst/module/runtime/OCLStablePState.cpp index 2a7a1c32f7..d4184e3e09 100644 --- a/opencl/tests/ocltst/module/runtime/OCLStablePState.cpp +++ b/opencl/tests/ocltst/module/runtime/OCLStablePState.cpp @@ -109,7 +109,7 @@ void OCLStablePState::run(void) { cl_set_device_clock_mode_output_amd setClockModeOutput = {}; error_ = _wrapper->clSetDeviceClockModeAMD(gpu_device, setClockModeInput, &setClockModeOutput); -#ifdef ATI_OS_WIN +#ifdef _WIN32 CHECK_RESULT(error_ != CL_SUCCESS, "SetClockMode profiling failed\n"); #else error_ = CL_SUCCESS; @@ -119,7 +119,7 @@ void OCLStablePState::run(void) { setClockModeOutput = {}; error_ = _wrapper->clSetDeviceClockModeAMD(gpu_device, setClockModeInput, &setClockModeOutput); -#ifdef ATI_OS_WIN +#ifdef _WIN32 CHECK_RESULT(error_ != CL_SUCCESS, "SetClockMode default failed\n"); #else error_ = CL_SUCCESS; diff --git a/opencl/tools/cltrace/cltrace.cpp b/opencl/tools/cltrace/cltrace.cpp index 300073a12d..be96298737 100644 --- a/opencl/tools/cltrace/cltrace.cpp +++ b/opencl/tools/cltrace/cltrace.cpp @@ -4377,7 +4377,7 @@ vdiAgent_OnLoad(vdi_agent * agent) std::string clTraceLogStr = clTraceLogEnv; const std::size_t pidPos = clTraceLogStr.find("%pid%"); if (pidPos != std::string::npos) { -#if defined(ATI_OS_WIN) +#if defined(_WIN32) const std::int32_t pid = _getpid(); #else const std::int32_t pid = getpid();