ahmed/OpenCL-CTS
1
0
Fork 0
mirror of https://github.com/KhronosGroup/OpenCL-CTS.git synced 2026-03-19 06:09:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improved PrintArch functions (#595) (#601)

Browse Source 
Moved all duplicate 'PrintArch' functions to testHarness.c
Replaced sysctl system call used in 'PrintArch' function with uname
system call

Signed-off-by: bhargavdas <bhargav_das@mentor.com>

Update testHarness.c
This commit is contained in:
Bhargav Das
2020-02-21 22:17:54 +05:30
committed by GitHub
parent 3a628cfae2
commit b2cb18073c
7 changed files with 55 additions and 248 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
test_common/harness/testHarness.cpp
View File

@@ -28,6 +28,8 @@
#include "typeWrappers.h" #include "typeWrappers.h"
#include "imageHelpers.h" #include "imageHelpers.h"
#include "parseParameters.h" #include "parseParameters.h"
#include <sys/utsname.h>
#include <sys/sysctl.h>
#if !defined(_WIN32) #if !defined(_WIN32)
#include <unistd.h> #include <unistd.h>
@@ -945,3 +947,52 @@ Version get_device_cl_version(cl_device_id device)
throw std::runtime_error(std::string("Unknown OpenCL version: ") + str.data()); throw std::runtime_error(std::string("Unknown OpenCL version: ") + str.data());
} }
void PrintArch( void )
{
vlog( "sizeof( void*) = %ld\n", sizeof( void *) );
#if defined( __ppc__ )
vlog( "ARCH:\tppc\n" );
#elif defined( __ppc64__ )
vlog( "ARCH:\tppc64\n" );
#elif defined( __PPC__ )
vlog( "ARCH:\tppc\n" );
#elif defined( __i386__ )
vlog( "ARCH:\ti386\n" );
#elif defined( __x86_64__ )
vlog( "ARCH:\tx86_64\n" );
#elif defined( __arm__ )
vlog( "ARCH:\tarm\n" );
#elif defined(__aarch64__)
vlog( "ARCH:\taarch64\n" );
#elif defined (_WIN32)
vlog( "ARCH:\tWindows\n" );
#else
#error unknown arch
#endif
#if defined( __APPLE__ )
int type = 0;
size_t typeSize = sizeof( type );
sysctlbyname( "hw.cputype", &type, &typeSize, NULL, 0 );
vlog( "cpu type:\t%d\n", type );
typeSize = sizeof( type );
sysctlbyname( "hw.cpusubtype", &type, &typeSize, NULL, 0 );
vlog( "cpu subtype:\t%d\n", type );
#elif defined( __linux__ )
struct utsname buffer;
if (uname(&buffer) != 0) {
vlog("uname error");
}
else {
vlog("system name = %s\n", buffer.sysname);
vlog("node name = %s\n", buffer.nodename);
vlog("release = %s\n", buffer.release);
vlog("version = %s\n", buffer.version);
vlog("machine = %s\n", buffer.machine);
}
#endif
}

2
test_common/harness/testHarness.h
View File

@@ -146,6 +146,8 @@ extern int gIsOpenCL_C_1_0_Device; // This is set to 1 if the device suppor
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
extern void PrintArch(void);
#endif // _testHarness_h #endif // _testHarness_h

58
test_conformance/contractions/contractions.c
View File

@@ -99,7 +99,6 @@ static size_t gArgCount;
static int ParseArgs( int argc, const char **argv ); static int ParseArgs( int argc, const char **argv );
static void PrintArch( void );
static void PrintUsage( void ); static void PrintUsage( void );
test_status InitCL( cl_device_id device ); test_status InitCL( cl_device_id device );
static void ReleaseCL( void ); static void ReleaseCL( void );
@@ -442,63 +441,6 @@ static int ParseArgs( int argc, const char **argv )
return 0; return 0;
} }
static void PrintArch( void )
{
vlog( "\nHost info:\n" );
vlog( "\tsizeof( void*) = %ld\n", sizeof( void *) );
#if defined( __ppc__ )
vlog( "\tARCH:\tppc\n" );
#elif defined( __ppc64__ )
vlog( "\tARCH:\tppc64\n" );
#elif defined( __PPC__ )
vlog( "ARCH:\tppc\n" );
#elif defined( __i386__ )
vlog( "\tARCH:\ti386\n" );
#elif defined( __x86_64__ )
vlog( "\tARCH:\tx86_64\n" );
#elif defined( __arm__ )
vlog( "\tARCH:\tarm\n" );
#elif defined( __aarch64__ )
vlog( "\tARCH:\taarch64\n" );
#else
vlog( "\tARCH:\tunknown\n" );
#endif
#if defined( __APPLE__ )
int type = 0;
size_t typeSize = sizeof( type );
sysctlbyname( "hw.cputype", &type, &typeSize, NULL, 0 );
vlog( "\tcpu type:\t%d\n", type );
typeSize = sizeof( type );
sysctlbyname( "hw.cpusubtype", &type, &typeSize, NULL, 0 );
vlog( "\tcpu subtype:\t%d\n", type );
#elif defined( __linux__ ) && !defined(__aarch64__)
int _sysctl(struct __sysctl_args *args );
#define OSNAMESZ 100
struct __sysctl_args args;
char osname[OSNAMESZ];
size_t osnamelth;
int name[] = { CTL_KERN, KERN_OSTYPE };
memset(&args, 0, sizeof(struct __sysctl_args));
args.name = name;
args.nlen = sizeof(name)/sizeof(name[0]);
args.oldval = osname;
args.oldlenp = &osnamelth;
osnamelth = sizeof(osname);
if (syscall(SYS__sysctl, &args) == -1) {
vlog( "_sysctl error\n" );
}
else {
vlog("this machine is running %*s\n", osnamelth, osname);
}
#endif
}
static void PrintUsage( void ) static void PrintUsage( void )
{ {
vlog( "%s [-z]: <optional: test names>\n", appName ); vlog( "%s [-z]: <optional: test names>\n", appName );

64
test_conformance/conversions/test_conversions.c
View File

@@ -114,7 +114,6 @@ static MTdata gMTdata;
static int ParseArgs( int argc, const char **argv ); static int ParseArgs( int argc, const char **argv );
static void PrintUsage( void ); static void PrintUsage( void );
static void PrintArch(void);
test_status InitCL( cl_device_id device ); test_status InitCL( cl_device_id device );
static int GetTestCase( const char *name, Type *outType, Type *inType, SaturationMode *sat, RoundingMode *round ); static int GetTestCase( const char *name, Type *outType, Type *inType, SaturationMode *sat, RoundingMode *round );
static int DoTest( cl_device_id device, Type outType, Type inType, SaturationMode sat, RoundingMode round, MTdata d ); static int DoTest( cl_device_id device, Type outType, Type inType, SaturationMode sat, RoundingMode round, MTdata d );
@@ -527,69 +526,6 @@ static void PrintUsage( void )
vlog( "You may also pass the number of the test on which to start.\nA second number can be then passed to indicate how many tests to run\n\n" ); vlog( "You may also pass the number of the test on which to start.\nA second number can be then passed to indicate how many tests to run\n\n" );
} }
static void PrintArch( void )
{
vlog( "sizeof( void*) = %ld\n", sizeof( void *) );
#if defined( __ppc__ )
vlog( "ARCH:\tppc\n" );
#elif defined( __ppc64__ )
vlog( "ARCH:\tppc64\n" );
#elif defined( __PPC__ )
vlog( "ARCH:\tppc\n" );
#elif defined( __i386__ )
vlog( "ARCH:\ti386\n" );
#elif defined( __x86_64__ )
vlog( "ARCH:\tx86_64\n" );
#elif defined( __arm__ )
vlog( "ARCH:\tarm\n" );
// Add 64 bit support
#elif defined(__aarch64__)
vlog( "ARCH:\taarch64\n" );
#elif defined (_WIN32)
vlog( "ARCH:\tWindows\n" );
#else
#error unknown arch
#endif
#if defined( __APPLE__ )
int type = 0;
size_t typeSize = sizeof( type );
sysctlbyname( "hw.cputype", &type, &typeSize, NULL, 0 );
vlog( "cpu type:\t%d\n", type );
typeSize = sizeof( type );
sysctlbyname( "hw.cpusubtype", &type, &typeSize, NULL, 0 );
vlog( "cpu subtype:\t%d\n", type );
#elif defined( __linux__ ) && !defined(__aarch64__)
#define OSNAMESZ 100
int _sysctl(struct __sysctl_args *args );
struct __sysctl_args args;
char osname[OSNAMESZ];
size_t osnamelth;
int name[] = { CTL_KERN, KERN_OSTYPE };
memset(&args, 0, sizeof(struct __sysctl_args));
args.name = name;
args.nlen = sizeof(name)/sizeof(name[0]);
args.oldval = osname;
args.oldlenp = &osnamelth;
osnamelth = sizeof(osname);
if (syscall(SYS__sysctl, &args) == -1) {
vlog( "_sysctl error\n" );
}
else {
vlog("this machine is running %*s\n", osnamelth, osname);
}
#endif
}
static int GetTestCase( const char *name, Type *outType, Type *inType, SaturationMode *sat, RoundingMode *round ) static int GetTestCase( const char *name, Type *outType, Type *inType, SaturationMode *sat, RoundingMode *round )
{ {

31
test_conformance/half/main.c
View File

@@ -47,7 +47,6 @@ const char *addressSpaceNames[AS_NumAddressSpaces] = {"global", "private", "loca
static int ParseArgs( int argc, const char **argv ); static int ParseArgs( int argc, const char **argv );
static void PrintUsage( void ); static void PrintUsage( void );
static void PrintArch(void);
int g_arrVecSizes[kVectorSizeCount+kStrangeVectorSizeCount]; int g_arrVecSizes[kVectorSizeCount+kStrangeVectorSizeCount];
@@ -251,33 +250,3 @@ static void PrintUsage( void )
} }
} }
static void PrintArch( void )
{
vlog( "sizeof( void*) = %ld\n", sizeof( void *) );
#if defined( __APPLE__ )
#if defined( __ppc__ )
vlog( "ARCH:\tppc\n" );
#elif defined( __ppc64__ )
vlog( "ARCH:\tppc64\n" );
#elif defined( __i386__ )
vlog( "ARCH:\ti386\n" );
#elif defined( __x86_64__ )
vlog( "ARCH:\tx86_64\n" );
#elif defined( __arm__ )
vlog( "ARCH:\tarm\n" );
#elif defined( __aarch64__ )
vlog( "\tARCH:\taarch64\n" );
#else
#error unknown arch
#endif
int type = 0;
size_t typeSize = sizeof( type );
sysctlbyname( "hw.cputype", &type, &typeSize, NULL, 0 );
vlog( "cpu type:\t%d\n", type );
typeSize = sizeof( type );
sysctlbyname( "hw.cpusubtype", &type, &typeSize, NULL, 0 );
vlog( "cpu subtype:\t%d\n", type );
#endif
}

58
test_conformance/math_brute_force/main.c
View File

@@ -126,7 +126,6 @@ size_t gNumBasicDoubleFuncs = sizeof(gBasicDoubleFuncs)/sizeof(char*);
static int ParseArgs( int argc, const char **argv ); static int ParseArgs( int argc, const char **argv );
static void PrintArch( void );
static void PrintUsage( void ); static void PrintUsage( void );
static void PrintFunctions( void ); static void PrintFunctions( void );
test_status InitCL( cl_device_id device ); test_status InitCL( cl_device_id device );
@@ -1137,63 +1136,6 @@ static int ParseArgs( int argc, const char **argv )
return 0; return 0;
} }
static void PrintArch( void )
{
vlog( "\nHost info:\n" );
vlog( "\tsizeof( void*) = %zd\n", sizeof( void *) );
#if defined( __ppc__ )
vlog( "\tARCH:\tppc\n" );
#elif defined( __ppc64__ )
vlog( "\tARCH:\tppc64\n" );
#elif defined( __PPC__ )
vlog( "ARCH:\tppc\n" );
#elif defined( __i386__ )
vlog( "\tARCH:\ti386\n" );
#elif defined( __x86_64__ )
vlog( "\tARCH:\tx86_64\n" );
#elif defined( __arm__ )
vlog( "\tARCH:\tarm\n" );
#elif defined( __aarch64__ )
vlog( "\tARCH:\taarch64\n");
#else
vlog( "\tARCH:\tunknown\n" );
#endif
#if defined( __APPLE__ )
int type = 0;
size_t typeSize = sizeof( type );
sysctlbyname( "hw.cputype", &type, &typeSize, NULL, 0 );
vlog( "\tcpu type:\t%d\n", type );
typeSize = sizeof( type );
sysctlbyname( "hw.cpusubtype", &type, &typeSize, NULL, 0 );
vlog( "\tcpu subtype:\t%d\n", type );
#elif defined( __linux__ ) && !defined(__aarch64__)
int _sysctl(struct __sysctl_args *args );
#define OSNAMESZ 100
struct __sysctl_args args;
char osname[OSNAMESZ];
size_t osnamelth;
int name[] = { CTL_KERN, KERN_OSTYPE };
memset(&args, 0, sizeof(struct __sysctl_args));
args.name = name;
args.nlen = sizeof(name)/sizeof(name[0]);
args.oldval = osname;
args.oldlenp = &osnamelth;
osnamelth = sizeof(osname);
if (syscall(SYS__sysctl, &args) == -1) {
vlog( "_sysctl error\n" );
}
else {
vlog("this machine is running %*s\n", osnamelth, osname);
}
#endif
}
static void PrintFunctions ( void ) static void PrintFunctions ( void )
{ {

39
test_conformance/printf/test_printf.c
View File

@@ -594,42 +594,6 @@ exit:
return err; return err;
} }
//-----------------------------------------
// printArch
//-----------------------------------------
static void printArch( void )
{
log_info( "sizeof( void*) = %d\n", (int) sizeof( void *) );
#if defined( __APPLE__ )
#if defined( __ppc__ )
log_info( "ARCH:\tppc\n" );
#elif defined( __ppc64__ )
log_info( "ARCH:\tppc64\n" );
#elif defined( __i386__ )
log_info( "ARCH:\ti386\n" );
#elif defined( __x86_64__ )
log_info( "ARCH:\tx86_64\n" );
#elif defined( __arm__ )
log_info( "ARCH:\tarm\n" );
#elif defined( __aarch64__ )
log_info( "ARCH:\taarch64\n" );
#else
#error unknown arch
#endif
int type = 0;
size_t typeSize = sizeof( type );
sysctlbyname( "hw.cputype", &type, &typeSize, NULL, 0 );
log_info( "cpu type:\t%d\n", type );
typeSize = sizeof( type );
sysctlbyname( "hw.cpusubtype", &type, &typeSize, NULL, 0 );
log_info( "cpu subtype:\t%d\n", type );
#endif
}
int test_int_0(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements) int test_int_0(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements)
{ {
@@ -1063,7 +1027,8 @@ test_status InitCL( cl_device_id device )
printDeviceHeader( device ); printDeviceHeader( device );
printArch(); PrintArch();
err = check_opencl_version(device,1,2); err = check_opencl_version(device,1,2);
if( err != CL_SUCCESS ) { if( err != CL_SUCCESS ) {