From 54deabb93d0d879ff347a48350ac928297e19be7 Mon Sep 17 00:00:00 2001 From: Aryan Salmanpour Date: Thu, 13 Aug 2020 17:26:44 -0400 Subject: [PATCH] [HipPerf] relocating/renaming some hip perf tests Change-Id: Ie85d242cd68cd14a858e07ed27875a5196014688 [ROCm/hip-tests commit: 8dfe3c92a7c663403b4845d1c5a4a63cbec8420e] --- .../hipPerfDispatchSpeed.cpp | 2 +- .../hipPerfBufferCopyRectSpeed.cpp | 2 +- .../hipPerfBufferCopySpeed.cpp | 2 +- ...NumaAlloc.cpp => hipPerfHostNumaAlloc.cpp} | 2 +- .../perftests/perfDispatch/timer.cpp | 116 ------------------ .../hip-tests/perftests/perfDispatch/timer.h | 28 ----- 6 files changed, 4 insertions(+), 148 deletions(-) rename projects/hip-tests/perftests/{perfDispatch => dispatch}/hipPerfDispatchSpeed.cpp (98%) rename projects/hip-tests/perftests/{perfDispatch => memory}/hipPerfBufferCopyRectSpeed.cpp (98%) rename projects/hip-tests/perftests/{perfDispatch => memory}/hipPerfBufferCopySpeed.cpp (98%) rename projects/hip-tests/perftests/memory/{hipHostNumaAlloc.cpp => hipPerfHostNumaAlloc.cpp} (97%) delete mode 100644 projects/hip-tests/perftests/perfDispatch/timer.cpp delete mode 100644 projects/hip-tests/perftests/perfDispatch/timer.h diff --git a/projects/hip-tests/perftests/perfDispatch/hipPerfDispatchSpeed.cpp b/projects/hip-tests/perftests/dispatch/hipPerfDispatchSpeed.cpp similarity index 98% rename from projects/hip-tests/perftests/perfDispatch/hipPerfDispatchSpeed.cpp rename to projects/hip-tests/perftests/dispatch/hipPerfDispatchSpeed.cpp index 84ba73c3aa..12999ebc33 100644 --- a/projects/hip-tests/perftests/perfDispatch/hipPerfDispatchSpeed.cpp +++ b/projects/hip-tests/perftests/dispatch/hipPerfDispatchSpeed.cpp @@ -7,7 +7,7 @@ #include "test_common.h" /* HIT_START - * BUILD: %t %s ../../src/test_common.cpp timer.cpp EXCLUDE_HIP_PLATFORM nvcc + * BUILD: %t %s ../../src/test_common.cpp ../../src/timer.cpp EXCLUDE_HIP_PLATFORM nvcc * TEST: %t * HIT_END */ diff --git a/projects/hip-tests/perftests/perfDispatch/hipPerfBufferCopyRectSpeed.cpp b/projects/hip-tests/perftests/memory/hipPerfBufferCopyRectSpeed.cpp similarity index 98% rename from projects/hip-tests/perftests/perfDispatch/hipPerfBufferCopyRectSpeed.cpp rename to projects/hip-tests/perftests/memory/hipPerfBufferCopyRectSpeed.cpp index 5000904af9..3cb3243e80 100644 --- a/projects/hip-tests/perftests/perfDispatch/hipPerfBufferCopyRectSpeed.cpp +++ b/projects/hip-tests/perftests/memory/hipPerfBufferCopyRectSpeed.cpp @@ -7,7 +7,7 @@ #include "test_common.h" /* HIT_START - * BUILD: %t %s ../../src/test_common.cpp timer.cpp EXCLUDE_HIP_PLATFORM nvcc + * BUILD: %t %s ../../src/test_common.cpp ../../src/timer.cpp EXCLUDE_HIP_PLATFORM nvcc * TEST: %t * HIT_END */ diff --git a/projects/hip-tests/perftests/perfDispatch/hipPerfBufferCopySpeed.cpp b/projects/hip-tests/perftests/memory/hipPerfBufferCopySpeed.cpp similarity index 98% rename from projects/hip-tests/perftests/perfDispatch/hipPerfBufferCopySpeed.cpp rename to projects/hip-tests/perftests/memory/hipPerfBufferCopySpeed.cpp index 6f284ae7fb..d9a2d443a2 100644 --- a/projects/hip-tests/perftests/perfDispatch/hipPerfBufferCopySpeed.cpp +++ b/projects/hip-tests/perftests/memory/hipPerfBufferCopySpeed.cpp @@ -7,7 +7,7 @@ #include "test_common.h" /* HIT_START - * BUILD: %t %s ../../src/test_common.cpp timer.cpp EXCLUDE_HIP_PLATFORM nvcc + * BUILD: %t %s ../../src/test_common.cpp ../../src/timer.cpp EXCLUDE_HIP_PLATFORM nvcc * TEST: %t * HIT_END */ diff --git a/projects/hip-tests/perftests/memory/hipHostNumaAlloc.cpp b/projects/hip-tests/perftests/memory/hipPerfHostNumaAlloc.cpp similarity index 97% rename from projects/hip-tests/perftests/memory/hipHostNumaAlloc.cpp rename to projects/hip-tests/perftests/memory/hipPerfHostNumaAlloc.cpp index 38401c8046..a5e60c8549 100644 --- a/projects/hip-tests/perftests/memory/hipHostNumaAlloc.cpp +++ b/projects/hip-tests/perftests/memory/hipPerfHostNumaAlloc.cpp @@ -34,7 +34,7 @@ THE SOFTWARE. #include #include "hip/hip_runtime.h" /* HIT_START - * BUILD_CMD: hipHostNumaAlloc %hc -I%S/../../src %S/%s %S/../../src/test_common.cpp -lnuma -o %T/%t EXCLUDE_HIP_PLATFORM nvcc + * BUILD_CMD: hipPerfHostNumaAlloc %hc -I%S/../../src %S/%s %S/../../src/test_common.cpp -lnuma -o %T/%t EXCLUDE_HIP_PLATFORM nvcc * TEST: %t * HIT_END */ diff --git a/projects/hip-tests/perftests/perfDispatch/timer.cpp b/projects/hip-tests/perftests/perfDispatch/timer.cpp deleted file mode 100644 index ea9c6ea1d9..0000000000 --- a/projects/hip-tests/perftests/perfDispatch/timer.cpp +++ /dev/null @@ -1,116 +0,0 @@ -#include "timer.h" - -#include - -#ifdef _WIN32 -#define WIN32_LEAN_AND_MEAN -#define VC_EXTRALEAN -#include -#pragma comment(lib, "user32") -#endif - -#ifdef __linux__ -#include -#define NANOSECONDS_PER_SEC 1000000000 -#endif - -CPerfCounter::CPerfCounter() : _clocks(0), _start(0) -{ - -#ifdef _WIN32 - - QueryPerformanceFrequency((LARGE_INTEGER *)&_freq); - -#endif - -#ifdef __linux__ - _freq = NANOSECONDS_PER_SEC; -#endif - -} - -CPerfCounter::~CPerfCounter() -{ - // EMPTY! -} - -void -CPerfCounter::Start(void) -{ - -#ifdef _WIN32 - - if( _start ) - { - MessageBox(NULL, "Bad Perf Counter Start", "Error", MB_OK); - exit(0); - } - QueryPerformanceCounter((LARGE_INTEGER *)&_start); - -#endif -#ifdef __linux__ - - struct timespec s; - clock_gettime(CLOCK_MONOTONIC, &s); - _start = (i64)s.tv_sec * NANOSECONDS_PER_SEC + (i64)s.tv_nsec ; - -#endif - -} - -void -CPerfCounter::Stop(void) -{ - i64 n; - -#ifdef _WIN32 - - if( !_start ) - { - MessageBox(NULL, "Bad Perf Counter Stop", "Error", MB_OK); - exit(0); - } - - QueryPerformanceCounter((LARGE_INTEGER *)&n); - -#endif -#ifdef __linux__ - - struct timespec s; - clock_gettime(CLOCK_MONOTONIC, &s); - n = (i64)s.tv_sec * NANOSECONDS_PER_SEC + (i64)s.tv_nsec ; - -#endif - - n -= _start; - _start = 0; - _clocks += n; -} - -void -CPerfCounter::Reset(void) -{ - -#ifdef _WIN32 - if( _start ) - { - MessageBox(NULL, "Bad Perf Counter Reset", "Error", MB_OK); - exit(0); - } -#endif - _clocks = 0; -} - -double -CPerfCounter::GetElapsedTime(void) -{ -#ifdef _WIN32 - if( _start ) { - MessageBox(NULL, "Trying to get time while still running.", "Error", MB_OK); - exit(0); - } -#endif - - return (double)_clocks / (double)_freq; - -} diff --git a/projects/hip-tests/perftests/perfDispatch/timer.h b/projects/hip-tests/perftests/perfDispatch/timer.h deleted file mode 100644 index 28bfeff74b..0000000000 --- a/projects/hip-tests/perftests/perfDispatch/timer.h +++ /dev/null @@ -1,28 +0,0 @@ -#ifndef _TIMER_H_ -#define _TIMER_H_ - -#ifdef _WIN32 -typedef __int64 i64 ; -#endif -#ifdef __linux__ -typedef long long i64; -#endif - -class CPerfCounter { - -public: - CPerfCounter(); - ~CPerfCounter(); - void Start(void); - void Stop(void); - void Reset(void); - double GetElapsedTime(void); - -private: - - i64 _freq; - i64 _clocks; - i64 _start; -}; - -#endif // _TIMER_H_