From a160d3ee2ef0ecfee1437f803d2d566e8e3e90e4 Mon Sep 17 00:00:00 2001 From: Rahul Garg Date: Thu, 15 Aug 2019 19:13:00 -0700 Subject: [PATCH] [dtests] refactor windows specific changes (#1313) * [dtests] refactor windows specific changes * Refactor hipMemoryAllocateCoherentDriver - PR- 1309 * Fix missing z in _putenv_s * Revert "Fix missing z in _putenv_s" This reverts commit 099a1b20a5c75c5f122d57c0ad2bca01745cdc9c. * Refactor changes from PR 1299 * Update hipEnvVarDriver.cpp [ROCm/clr commit: c741ad3c800fba2b000e8b0de07be1325f9c446d] --- projects/clr/hipamd/tests/src/hipEnvVar.cpp | 9 +-------- projects/clr/hipamd/tests/src/hipEnvVarDriver.cpp | 8 +------- .../tests/src/runtimeApi/memory/hipMemcpy_simple.cpp | 3 --- .../memory/hipMemoryAllocateCoherentDriver.cpp | 7 +------ projects/clr/hipamd/tests/src/test_common.h | 8 ++++++++ 5 files changed, 11 insertions(+), 24 deletions(-) diff --git a/projects/clr/hipamd/tests/src/hipEnvVar.cpp b/projects/clr/hipamd/tests/src/hipEnvVar.cpp index 7c261b1fa3..a0b9503b41 100644 --- a/projects/clr/hipamd/tests/src/hipEnvVar.cpp +++ b/projects/clr/hipamd/tests/src/hipEnvVar.cpp @@ -31,14 +31,7 @@ THE SOFTWARE. #include "clara/clara.hpp" #include #include "hip/hip_runtime.h" - -#ifdef _WIN64 -#include -#endif - -#ifdef _WIN64 -#define setenv(x,y,z) _putenv_s(x,y) -#endif +#include "test_common.h" using namespace std; using namespace clara; diff --git a/projects/clr/hipamd/tests/src/hipEnvVarDriver.cpp b/projects/clr/hipamd/tests/src/hipEnvVarDriver.cpp index 37e51faa31..4817d157a4 100644 --- a/projects/clr/hipamd/tests/src/hipEnvVarDriver.cpp +++ b/projects/clr/hipamd/tests/src/hipEnvVarDriver.cpp @@ -30,13 +30,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA #include "hip/hip_runtime.h" #include #include - -#ifdef _WIN64 -#define popen(x,y) _popen(x,y) -#define pclose(x) _pclose(x) -#define setenv(x,y,z) _putenv_s(x,y) -#define unsetenv(x) _putenv_s(x,"") -#endif +#include "test_common.h" using namespace std; diff --git a/projects/clr/hipamd/tests/src/runtimeApi/memory/hipMemcpy_simple.cpp b/projects/clr/hipamd/tests/src/runtimeApi/memory/hipMemcpy_simple.cpp index dcec1fd834..8ce02d6164 100644 --- a/projects/clr/hipamd/tests/src/runtimeApi/memory/hipMemcpy_simple.cpp +++ b/projects/clr/hipamd/tests/src/runtimeApi/memory/hipMemcpy_simple.cpp @@ -29,9 +29,6 @@ THE SOFTWARE. #include "hip/hip_runtime.h" #include "test_common.h" -#ifdef _WIN64 -#define aligned_alloc _aligned_malloc -#endif bool p_async = false; diff --git a/projects/clr/hipamd/tests/src/runtimeApi/memory/hipMemoryAllocateCoherentDriver.cpp b/projects/clr/hipamd/tests/src/runtimeApi/memory/hipMemoryAllocateCoherentDriver.cpp index a064a6ad0a..b9d7602039 100644 --- a/projects/clr/hipamd/tests/src/runtimeApi/memory/hipMemoryAllocateCoherentDriver.cpp +++ b/projects/clr/hipamd/tests/src/runtimeApi/memory/hipMemoryAllocateCoherentDriver.cpp @@ -29,12 +29,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA #include #include #include "hip/hip_runtime.h" - -#ifdef _WIN64 -#define popen(x,y) _popen(x,y) -#define pclose(x) _pclose(x) -#define setenv(x,y,z) _putenv_s(x,y) -#endif +#include "test_common.h" using namespace std; diff --git a/projects/clr/hipamd/tests/src/test_common.h b/projects/clr/hipamd/tests/src/test_common.h index 8820381826..78aa845076 100644 --- a/projects/clr/hipamd/tests/src/test_common.h +++ b/projects/clr/hipamd/tests/src/test_common.h @@ -95,6 +95,14 @@ THE SOFTWARE. } \ } +#ifdef _WIN64 +#include +#define aligned_alloc _aligned_malloc +#define popen(x,y) _popen(x,y) +#define pclose(x) _pclose(x) +#define setenv(x,y,z) _putenv_s(x,y) +#endif + // standard command-line variables: extern size_t N; extern char memsetval;