ahmed/OpenCL-CTS
1
0
Fork 0
mirror of https://github.com/KhronosGroup/OpenCL-CTS.git synced 2026-03-25 16:29:03 +00:00
Code Packages Projects Releases Wiki Activity

Test images - remove setting gDeviceType. (#653)

Browse Source 
This is handled in testHarness.cpp
This commit is contained in:
Kévin Petit
2020-03-05 14:11:37 +00:00
committed by GitHub
parent c9c3c73aa9
commit e62cd4a2b9
7 changed files with 7 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
test_conformance/images/clCopyImage/main.cpp
View File

@@ -122,16 +122,7 @@ int main(int argc, const char *argv[])
// Parse arguments // Parse arguments
for( int i = 1; i < argc; i++ ) for( int i = 1; i < argc; i++ )
{ {
if( strcmp( argv[i], "cpu" ) == 0 || strcmp( argv[i], "CL_DEVICE_TYPE_CPU" ) == 0 ) if( strcmp( argv[i], "test_mipmaps" ) == 0 )
gDeviceType = CL_DEVICE_TYPE_CPU;
else if( strcmp( argv[i], "gpu" ) == 0 || strcmp( argv[i], "CL_DEVICE_TYPE_GPU" ) == 0 )
gDeviceType = CL_DEVICE_TYPE_GPU;
else if( strcmp( argv[i], "accelerator" ) == 0 || strcmp( argv[i], "CL_DEVICE_TYPE_ACCELERATOR" ) == 0 )
gDeviceType = CL_DEVICE_TYPE_ACCELERATOR;
else if( strcmp( argv[i], "CL_DEVICE_TYPE_DEFAULT" ) == 0 )
gDeviceType = CL_DEVICE_TYPE_DEFAULT;
else if( strcmp( argv[i], "test_mipmaps" ) == 0 )
{ {
gTestMipmaps = true; gTestMipmaps = true;
// Don't test pitches with mipmaps, at least currently. // Don't test pitches with mipmaps, at least currently.

11
test_conformance/images/clFillImage/main.cpp
View File

@@ -89,16 +89,7 @@ int main(int argc, const char *argv[])
// Parse arguments // Parse arguments
for ( int i = 1; i < argc; i++ ) for ( int i = 1; i < argc; i++ )
{ {
if ( strcmp( argv[i], "cpu" ) == 0 || strcmp( argv[i], "CL_DEVICE_TYPE_CPU" ) == 0 ) if ( strcmp( argv[i], "debug_trace" ) == 0 )
gDeviceType = CL_DEVICE_TYPE_CPU;
else if ( strcmp( argv[i], "gpu" ) == 0 || strcmp( argv[i], "CL_DEVICE_TYPE_GPU" ) == 0 )
gDeviceType = CL_DEVICE_TYPE_GPU;
else if ( strcmp( argv[i], "accelerator" ) == 0 || strcmp( argv[i], "CL_DEVICE_TYPE_ACCELERATOR" ) == 0 )
gDeviceType = CL_DEVICE_TYPE_ACCELERATOR;
else if ( strcmp( argv[i], "CL_DEVICE_TYPE_DEFAULT" ) == 0 )
gDeviceType = CL_DEVICE_TYPE_DEFAULT;
else if ( strcmp( argv[i], "debug_trace" ) == 0 )
gDebugTrace = true; gDebugTrace = true;
else if ( strcmp( argv[i], "small_images" ) == 0 ) else if ( strcmp( argv[i], "small_images" ) == 0 )

11
test_conformance/images/clGetInfo/main.cpp
View File

@@ -91,16 +91,7 @@ int main(int argc, const char *argv[])
// Parse arguments // Parse arguments
for( int i = 1; i < argc; i++ ) for( int i = 1; i < argc; i++ )
{ {
if( strcmp( argv[i], "cpu" ) == 0 || strcmp( argv[i], "CL_DEVICE_TYPE_CPU" ) == 0 ) if( strcmp( argv[i], "debug_trace" ) == 0 )
gDeviceType = CL_DEVICE_TYPE_CPU;
else if( strcmp( argv[i], "gpu" ) == 0 || strcmp( argv[i], "CL_DEVICE_TYPE_GPU" ) == 0 )
gDeviceType = CL_DEVICE_TYPE_GPU;
else if( strcmp( argv[i], "accelerator" ) == 0 || strcmp( argv[i], "CL_DEVICE_TYPE_ACCELERATOR" ) == 0 )
gDeviceType = CL_DEVICE_TYPE_ACCELERATOR;
else if( strcmp( argv[i], "CL_DEVICE_TYPE_DEFAULT" ) == 0 )
gDeviceType = CL_DEVICE_TYPE_DEFAULT;
else if( strcmp( argv[i], "debug_trace" ) == 0 )
gDebugTrace = true; gDebugTrace = true;
else if( strcmp( argv[i], "small_images" ) == 0 ) else if( strcmp( argv[i], "small_images" ) == 0 )

11
test_conformance/images/clReadWriteImage/main.cpp
View File

@@ -89,16 +89,7 @@ int main(int argc, const char *argv[])
// Parse arguments // Parse arguments
for( int i = 1; i < argc; i++ ) for( int i = 1; i < argc; i++ )
{ {
if( strcmp( argv[i], "cpu" ) == 0 || strcmp( argv[i], "CL_DEVICE_TYPE_CPU" ) == 0 ) if( strcmp( argv[i], "debug_trace" ) == 0 )
gDeviceType = CL_DEVICE_TYPE_CPU;
else if( strcmp( argv[i], "gpu" ) == 0 || strcmp( argv[i], "CL_DEVICE_TYPE_GPU" ) == 0 )
gDeviceType = CL_DEVICE_TYPE_GPU;
else if( strcmp( argv[i], "accelerator" ) == 0 || strcmp( argv[i], "CL_DEVICE_TYPE_ACCELERATOR" ) == 0 )
gDeviceType = CL_DEVICE_TYPE_ACCELERATOR;
else if( strcmp( argv[i], "CL_DEVICE_TYPE_DEFAULT" ) == 0 )
gDeviceType = CL_DEVICE_TYPE_DEFAULT;
else if( strcmp( argv[i], "debug_trace" ) == 0 )
gDebugTrace = true; gDebugTrace = true;
else if( strcmp( argv[i], "small_images" ) == 0 ) else if( strcmp( argv[i], "small_images" ) == 0 )

11
test_conformance/images/kernel_image_methods/main.cpp
View File

@@ -95,16 +95,7 @@ int main(int argc, const char *argv[])
// Parse arguments // Parse arguments
for( int i = 1; i < argc; i++ ) for( int i = 1; i < argc; i++ )
{ {
if( strcmp( argv[i], "cpu" ) == 0 || strcmp( argv[i], "CL_DEVICE_TYPE_CPU" ) == 0 ) if( strcmp( argv[i], "debug_trace" ) == 0 )
gDeviceType = CL_DEVICE_TYPE_CPU;
else if( strcmp( argv[i], "gpu" ) == 0 || strcmp( argv[i], "CL_DEVICE_TYPE_GPU" ) == 0 )
gDeviceType = CL_DEVICE_TYPE_GPU;
else if( strcmp( argv[i], "accelerator" ) == 0 || strcmp( argv[i], "CL_DEVICE_TYPE_ACCELERATOR" ) == 0 )
gDeviceType = CL_DEVICE_TYPE_ACCELERATOR;
else if( strcmp( argv[i], "CL_DEVICE_TYPE_DEFAULT" ) == 0 )
gDeviceType = CL_DEVICE_TYPE_DEFAULT;
else if( strcmp( argv[i], "debug_trace" ) == 0 )
gDebugTrace = true; gDebugTrace = true;
else if( strcmp( argv[i], "small_images" ) == 0 ) else if( strcmp( argv[i], "small_images" ) == 0 )

11
test_conformance/images/kernel_read_write/main.cpp
View File

@@ -297,16 +297,7 @@ int main(int argc, const char *argv[])
// Parse arguments // Parse arguments
for( int i = 1; i < argc; i++ ) for( int i = 1; i < argc; i++ )
{ {
if( strcmp( argv[i], "cpu" ) == 0 || strcmp( argv[i], "CL_DEVICE_TYPE_CPU" ) == 0 ) if( strcmp( argv[i], "debug_trace" ) == 0 )
gDeviceType = CL_DEVICE_TYPE_CPU;
else if( strcmp( argv[i], "gpu" ) == 0 || strcmp( argv[i], "CL_DEVICE_TYPE_GPU" ) == 0 )
gDeviceType = CL_DEVICE_TYPE_GPU;
else if( strcmp( argv[i], "accelerator" ) == 0 || strcmp( argv[i], "CL_DEVICE_TYPE_ACCELERATOR" ) == 0 )
gDeviceType = CL_DEVICE_TYPE_ACCELERATOR;
else if( strcmp( argv[i], "CL_DEVICE_TYPE_DEFAULT" ) == 0 )
gDeviceType = CL_DEVICE_TYPE_DEFAULT;
else if( strcmp( argv[i], "debug_trace" ) == 0 )
gDebugTrace = true; gDebugTrace = true;
else if( strcmp( argv[i], "CL_FILTER_NEAREST" ) == 0 || strcmp( argv[i], "NEAREST" ) == 0 ) else if( strcmp( argv[i], "CL_FILTER_NEAREST" ) == 0 || strcmp( argv[i], "NEAREST" ) == 0 )

11
test_conformance/images/samplerlessReads/main.cpp
View File

@@ -107,16 +107,7 @@ int main(int argc, const char *argv[])
// Parse arguments // Parse arguments
for ( int i = 1; i < argc; i++ ) for ( int i = 1; i < argc; i++ )
{ {
if ( strcmp( argv[i], "cpu" ) == 0 || strcmp( argv[i], "CL_DEVICE_TYPE_CPU" ) == 0 ) if ( strcmp( argv[i], "debug_trace" ) == 0 )
gDeviceType = CL_DEVICE_TYPE_CPU;
else if ( strcmp( argv[i], "gpu" ) == 0 || strcmp( argv[i], "CL_DEVICE_TYPE_GPU" ) == 0 )
gDeviceType = CL_DEVICE_TYPE_GPU;
else if ( strcmp( argv[i], "accelerator" ) == 0 || strcmp( argv[i], "CL_DEVICE_TYPE_ACCELERATOR" ) == 0 )
gDeviceType = CL_DEVICE_TYPE_ACCELERATOR;
else if ( strcmp( argv[i], "CL_DEVICE_TYPE_DEFAULT" ) == 0 )
gDeviceType = CL_DEVICE_TYPE_DEFAULT;
else if ( strcmp( argv[i], "debug_trace" ) == 0 )
gDebugTrace = true; gDebugTrace = true;
else if ( strcmp( argv[i], "read_write" ) == 0 ) else if ( strcmp( argv[i], "read_write" ) == 0 )
gTestReadWrite = true; gTestReadWrite = true;