From 1678c03e90d104bb0ce5159b0443e2960ef20cd4 Mon Sep 17 00:00:00 2001 From: Alex Xie Date: Mon, 17 Apr 2023 15:19:57 -0400 Subject: [PATCH] SWDEV-390565 - ocltst test failing part 2 of the fix Change-Id: I4ff2cf0f82b5cf57c7ee51a60bbac770a605a837 [ROCm/clr commit: 42f8b9183d9ac68202573530790c6123bdbb27c5] --- .../tests/ocltst/module/perf/OCLPerfImageCopyCorners.cpp | 2 +- .../opencl/tests/ocltst/module/perf/OCLPerfImageCopySpeed.cpp | 2 +- .../opencl/tests/ocltst/module/perf/OCLPerfImageCreate.cpp | 2 +- .../opencl/tests/ocltst/module/perf/OCLPerfImageMapUnmap.cpp | 2 +- .../opencl/tests/ocltst/module/perf/OCLPerfImageReadSpeed.cpp | 4 ++-- .../opencl/tests/ocltst/module/perf/OCLPerfImageReadWrite.cpp | 2 +- .../opencl/tests/ocltst/module/perf/OCLPerfImageReadsRGBA.cpp | 2 +- .../tests/ocltst/module/perf/OCLPerfImageSampleRate.cpp | 2 +- .../tests/ocltst/module/perf/OCLPerfImageWriteSpeed.cpp | 4 ++-- .../tests/ocltst/module/perf/OCLPerfMapImageReadSpeed.cpp | 2 +- .../tests/ocltst/module/perf/OCLPerfMapImageWriteSpeed.cpp | 2 +- 11 files changed, 13 insertions(+), 13 deletions(-) diff --git a/projects/clr/opencl/tests/ocltst/module/perf/OCLPerfImageCopyCorners.cpp b/projects/clr/opencl/tests/ocltst/module/perf/OCLPerfImageCopyCorners.cpp index 39af9dd6cc..662398033a 100644 --- a/projects/clr/opencl/tests/ocltst/module/perf/OCLPerfImageCopyCorners.cpp +++ b/projects/clr/opencl/tests/ocltst/module/perf/OCLPerfImageCopyCorners.cpp @@ -174,7 +174,7 @@ void OCLPerfImageCopyCorners::open(unsigned int test, char *units, CHECK_RESULT(_deviceId >= num_devices, "Requested deviceID not available"); device = devices[_deviceId]; size_t size; - bool imageSupport_ = false; + cl_bool imageSupport_ = false; error_ = _wrapper->clGetDeviceInfo(device, CL_DEVICE_IMAGE_SUPPORT, sizeof(imageSupport_), &imageSupport_, &size); if (!imageSupport_) { diff --git a/projects/clr/opencl/tests/ocltst/module/perf/OCLPerfImageCopySpeed.cpp b/projects/clr/opencl/tests/ocltst/module/perf/OCLPerfImageCopySpeed.cpp index 29d72372ce..120d69bf05 100644 --- a/projects/clr/opencl/tests/ocltst/module/perf/OCLPerfImageCopySpeed.cpp +++ b/projects/clr/opencl/tests/ocltst/module/perf/OCLPerfImageCopySpeed.cpp @@ -162,7 +162,7 @@ void OCLPerfImageCopySpeed::open(unsigned int test, char *units, CHECK_RESULT(_deviceId >= num_devices, "Requested deviceID not available"); device = devices[_deviceId]; size_t size; - bool imageSupport_ = false; + cl_bool imageSupport_ = false; error_ = _wrapper->clGetDeviceInfo(device, CL_DEVICE_IMAGE_SUPPORT, sizeof(imageSupport_), &imageSupport_, &size); if (!imageSupport_) { diff --git a/projects/clr/opencl/tests/ocltst/module/perf/OCLPerfImageCreate.cpp b/projects/clr/opencl/tests/ocltst/module/perf/OCLPerfImageCreate.cpp index 3769752cc9..57b2cd3381 100644 --- a/projects/clr/opencl/tests/ocltst/module/perf/OCLPerfImageCreate.cpp +++ b/projects/clr/opencl/tests/ocltst/module/perf/OCLPerfImageCreate.cpp @@ -108,7 +108,7 @@ void OCLPerfImageCreate::open(unsigned int test, char *units, } delete strVersion; size_t size; - bool imageSupport_ = false; + cl_bool imageSupport_ = false; error_ = _wrapper->clGetDeviceInfo(devices_[_deviceId], CL_DEVICE_IMAGE_SUPPORT, sizeof(imageSupport_), &imageSupport_, &size); if (!imageSupport_) { diff --git a/projects/clr/opencl/tests/ocltst/module/perf/OCLPerfImageMapUnmap.cpp b/projects/clr/opencl/tests/ocltst/module/perf/OCLPerfImageMapUnmap.cpp index 680e43af14..d26192c21a 100644 --- a/projects/clr/opencl/tests/ocltst/module/perf/OCLPerfImageMapUnmap.cpp +++ b/projects/clr/opencl/tests/ocltst/module/perf/OCLPerfImageMapUnmap.cpp @@ -163,7 +163,7 @@ void OCLPerfImageMapUnmap::open(unsigned int test, char *units, CHECK_RESULT(_deviceId >= num_devices, "Requested deviceID not available"); device = devices[_deviceId]; size_t size; - bool imageSupport_ = false; + cl_bool imageSupport_ = false; error_ = _wrapper->clGetDeviceInfo(device, CL_DEVICE_IMAGE_SUPPORT, sizeof(imageSupport_), &imageSupport_, &size); if (!imageSupport_) { diff --git a/projects/clr/opencl/tests/ocltst/module/perf/OCLPerfImageReadSpeed.cpp b/projects/clr/opencl/tests/ocltst/module/perf/OCLPerfImageReadSpeed.cpp index f0095c24de..e963e9d85c 100644 --- a/projects/clr/opencl/tests/ocltst/module/perf/OCLPerfImageReadSpeed.cpp +++ b/projects/clr/opencl/tests/ocltst/module/perf/OCLPerfImageReadSpeed.cpp @@ -108,7 +108,7 @@ void OCLPerfImageReadSpeed::open(unsigned int test, char *units, CHECK_RESULT(_deviceId >= num_devices, "Requested deviceID not available"); device = devices[_deviceId]; size_t size; - bool imageSupport_ = false; + cl_bool imageSupport_ = false; error_ = _wrapper->clGetDeviceInfo(device, CL_DEVICE_IMAGE_SUPPORT, sizeof(imageSupport_), &imageSupport_, &size); if (!imageSupport_) { @@ -252,7 +252,7 @@ void OCLPerfPinnedImageReadSpeed::open(unsigned int test, char *units, CHECK_RESULT(_deviceId >= num_devices, "Requested deviceID not available"); device = devices[_deviceId]; size_t size; - bool imageSupport_ = false; + cl_bool imageSupport_ = false; error_ = _wrapper->clGetDeviceInfo(device, CL_DEVICE_IMAGE_SUPPORT, sizeof(imageSupport_), &imageSupport_, &size); if (!imageSupport_) { diff --git a/projects/clr/opencl/tests/ocltst/module/perf/OCLPerfImageReadWrite.cpp b/projects/clr/opencl/tests/ocltst/module/perf/OCLPerfImageReadWrite.cpp index c069da6231..e8960362ab 100644 --- a/projects/clr/opencl/tests/ocltst/module/perf/OCLPerfImageReadWrite.cpp +++ b/projects/clr/opencl/tests/ocltst/module/perf/OCLPerfImageReadWrite.cpp @@ -124,7 +124,7 @@ void OCLPerfImageReadWrite::open(unsigned int test, char *units, } delete strVersion; size_t size; - bool imageSupport_ = false; + cl_bool imageSupport_ = false; error_ = _wrapper->clGetDeviceInfo(devices_[_deviceId], CL_DEVICE_IMAGE_SUPPORT, sizeof(imageSupport_), &imageSupport_, &size); if (!imageSupport_) { diff --git a/projects/clr/opencl/tests/ocltst/module/perf/OCLPerfImageReadsRGBA.cpp b/projects/clr/opencl/tests/ocltst/module/perf/OCLPerfImageReadsRGBA.cpp index 8f92c2ce6d..086bdf0148 100644 --- a/projects/clr/opencl/tests/ocltst/module/perf/OCLPerfImageReadsRGBA.cpp +++ b/projects/clr/opencl/tests/ocltst/module/perf/OCLPerfImageReadsRGBA.cpp @@ -127,7 +127,7 @@ void OCLPerfImageReadsRGBA::open(unsigned int test, char *units, } delete strVersion; size_t size; - bool imageSupport_ = false; + cl_bool imageSupport_ = false; error_ = _wrapper->clGetDeviceInfo(devices_[_deviceId], CL_DEVICE_IMAGE_SUPPORT, sizeof(imageSupport_), &imageSupport_, &size); if (!imageSupport_) { diff --git a/projects/clr/opencl/tests/ocltst/module/perf/OCLPerfImageSampleRate.cpp b/projects/clr/opencl/tests/ocltst/module/perf/OCLPerfImageSampleRate.cpp index 45c8971658..c5743dbcd1 100644 --- a/projects/clr/opencl/tests/ocltst/module/perf/OCLPerfImageSampleRate.cpp +++ b/projects/clr/opencl/tests/ocltst/module/perf/OCLPerfImageSampleRate.cpp @@ -177,7 +177,7 @@ void OCLPerfImageSampleRate::open(unsigned int test, char *units, CHECK_RESULT(_deviceId >= num_devices, "Requested deviceID not available"); device = devices[_deviceId]; size_t size; - bool imageSupport_ = false; + cl_bool imageSupport_ = false; error_ = _wrapper->clGetDeviceInfo(device, CL_DEVICE_IMAGE_SUPPORT, sizeof(imageSupport_), &imageSupport_, &size); if (!imageSupport_) { diff --git a/projects/clr/opencl/tests/ocltst/module/perf/OCLPerfImageWriteSpeed.cpp b/projects/clr/opencl/tests/ocltst/module/perf/OCLPerfImageWriteSpeed.cpp index 3e132ba149..a85cdc36de 100644 --- a/projects/clr/opencl/tests/ocltst/module/perf/OCLPerfImageWriteSpeed.cpp +++ b/projects/clr/opencl/tests/ocltst/module/perf/OCLPerfImageWriteSpeed.cpp @@ -129,7 +129,7 @@ void OCLPerfImageWriteSpeed::open(unsigned int test, char *units, CHECK_RESULT(_deviceId >= num_devices, "Requested deviceID not available"); device = devices[_deviceId]; size_t size; - bool imageSupport_ = false; + cl_bool imageSupport_ = false; error_ = _wrapper->clGetDeviceInfo(device, CL_DEVICE_IMAGE_SUPPORT, sizeof(imageSupport_), &imageSupport_, &size); if (!imageSupport_) { @@ -275,7 +275,7 @@ void OCLPerfPinnedImageWriteSpeed::open(unsigned int test, char *units, CHECK_RESULT(_deviceId >= num_devices, "Requested deviceID not available"); device = devices[_deviceId]; size_t size; - bool imageSupport_ = false; + cl_bool imageSupport_ = false; error_ = _wrapper->clGetDeviceInfo(device, CL_DEVICE_IMAGE_SUPPORT, sizeof(imageSupport_), &imageSupport_, &size); if (!imageSupport_) { diff --git a/projects/clr/opencl/tests/ocltst/module/perf/OCLPerfMapImageReadSpeed.cpp b/projects/clr/opencl/tests/ocltst/module/perf/OCLPerfMapImageReadSpeed.cpp index b1f36f4ad9..2f6b571cac 100644 --- a/projects/clr/opencl/tests/ocltst/module/perf/OCLPerfMapImageReadSpeed.cpp +++ b/projects/clr/opencl/tests/ocltst/module/perf/OCLPerfMapImageReadSpeed.cpp @@ -130,7 +130,7 @@ void OCLPerfMapImageReadSpeed::open(unsigned int test, char *units, device = devices[_deviceId]; size_t size; - bool imageSupport_ = false; + cl_bool imageSupport_ = false; error_ = _wrapper->clGetDeviceInfo(device, CL_DEVICE_IMAGE_SUPPORT, sizeof(imageSupport_), &imageSupport_, &size); if (!imageSupport_) { diff --git a/projects/clr/opencl/tests/ocltst/module/perf/OCLPerfMapImageWriteSpeed.cpp b/projects/clr/opencl/tests/ocltst/module/perf/OCLPerfMapImageWriteSpeed.cpp index 3499424df1..4bfb895e01 100644 --- a/projects/clr/opencl/tests/ocltst/module/perf/OCLPerfMapImageWriteSpeed.cpp +++ b/projects/clr/opencl/tests/ocltst/module/perf/OCLPerfMapImageWriteSpeed.cpp @@ -131,7 +131,7 @@ void OCLPerfMapImageWriteSpeed::open(unsigned int test, char *units, CHECK_RESULT(_deviceId >= num_devices, "Requested deviceID not available"); device = devices[_deviceId]; size_t size; - bool imageSupport_ = false; + cl_bool imageSupport_ = false; error_ = _wrapper->clGetDeviceInfo(device, CL_DEVICE_IMAGE_SUPPORT, sizeof(imageSupport_), &imageSupport_, &size); if (!imageSupport_) {