cory-master/BabelStream
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add --float option to cli

Browse Source
This commit is contained in:
Tom Deakin 2015-07-23 12:15:58 +01:00
parent ae7a352809
commit e7fc832771
1 changed files with 76 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

114
ocl-stream.cpp
View File

@ -10,10 +10,12 @@
#define __CL_ENABLE_EXCEPTIONS #define __CL_ENABLE_EXCEPTIONS
#include "cl.hpp" #include "cl.hpp"
#define DATATYPE double
unsigned int ARRAY_SIZE = 50000000; unsigned int ARRAY_SIZE = 50000000;
unsigned int NTIMES = 10; unsigned int NTIMES = 10;
size_t DATATYPE_SIZE = sizeof(double);
bool useFloat = false;
#define MIN(a,b) ((a) < (b)) ? (a) : (b) #define MIN(a,b) ((a) < (b)) ? (a) : (b)
#define MAX(a,b) ((a) > (b)) ? (a) : (b) #define MAX(a,b) ((a) > (b)) ? (a) : (b)
@ -23,7 +25,6 @@ void parseArguments(int argc, char *argv[]);
std::string getDeviceName(const cl::Device& device); std::string getDeviceName(const cl::Device& device);
unsigned getDeviceList(std::vector<cl::Device>& devices); unsigned getDeviceList(std::vector<cl::Device>& devices);
struct badfile : public std::exception struct badfile : public std::exception
{ {
virtual const char * what () const throw () virtual const char * what () const throw ()
@ -32,14 +33,6 @@ struct badfile : public std::exception
} }
}; };
struct badtype : public std::exception
{
virtual const char * what () const throw ()
{
return "Datatype is not 4 or 8";
}
};
struct invaliddevice : public std::exception struct invaliddevice : public std::exception
{ {
virtual const char * what () const throw () virtual const char * what () const throw ()
@ -57,27 +50,37 @@ struct badntimes : public std::exception
}; };
size_t sizes[4] = { size_t sizes[4] = {
2 * sizeof(DATATYPE) * ARRAY_SIZE, 2 * DATATYPE_SIZE * ARRAY_SIZE,
2 * sizeof(DATATYPE) * ARRAY_SIZE, 2 * DATATYPE_SIZE * ARRAY_SIZE,
3 * sizeof(DATATYPE) * ARRAY_SIZE, 3 * DATATYPE_SIZE * ARRAY_SIZE,
3 * sizeof(DATATYPE) * ARRAY_SIZE 3 * DATATYPE_SIZE * ARRAY_SIZE
}; };
void check_solution(std::vector<DATATYPE>& a, std::vector<DATATYPE>& b, std::vector<DATATYPE>& c) void check_solution(void* a, void* b, void* c)
{ {
// Generate correct solution // Generate correct solution
DATATYPE golda = 1.0; double golda = 1.0;
DATATYPE goldb = 2.0; double goldb = 2.0;
DATATYPE goldc = 0.0; double goldc = 0.0;
float goldaf = 1.0;
float goldbf = 2.0;
float goldcf = 0.0;
const DATATYPE scalar = 3.0; const double scalar = 3.0;
const float scalarf = 3.0;
for (unsigned int i = 0; i < NTIMES; i++) for (unsigned int i = 0; i < NTIMES; i++)
{ {
// Double
goldc = golda; goldc = golda;
goldb = scalar * goldc; goldb = scalar * goldc;
goldc = golda + goldb; goldc = golda + goldb;
golda = goldb + scalar * goldc; golda = goldb + scalar * goldc;
// Float
goldcf = goldaf;
goldbf = scalarf * goldcf;
goldcf = goldaf + goldbf;
goldaf = goldbf + scalarf * goldcf;
} }
// Calculate average error // Calculate average error
@ -86,18 +89,26 @@ void check_solution(std::vector<DATATYPE>& a, std::vector<DATATYPE>& b, std::vec
double errc = 0.0; double errc = 0.0;
for (unsigned int i = 0; i < ARRAY_SIZE; i++) for (unsigned int i = 0; i < ARRAY_SIZE; i++)
{ {
erra += fabs(a[i] - golda); if (useFloat)
errb += fabs(b[i] - goldb); {
errc += fabs(c[i] - goldc); erra += fabsf(((float*)a)[i] - goldaf);
errb += fabsf(((float*)b)[i] - goldbf);
errc += fabsf(((float*)c)[i] - goldcf);
}
else
{
erra += fabs(((double*)a)[i] - (double)golda);
errb += fabs(((double*)b)[i] - (double)goldb);
errc += fabs(((double*)c)[i] - (double)goldc);
}
} }
erra /= (double)ARRAY_SIZE; erra /= (double)ARRAY_SIZE;
errb /= (double)ARRAY_SIZE; errb /= (double)ARRAY_SIZE;
errc /= (double)ARRAY_SIZE; errc /= (double)ARRAY_SIZE;
double epsi; double epsi;
if (sizeof(DATATYPE) == 4) epsi = 1.0E-6; if (useFloat) epsi = 1.0E-6;
else if (sizeof(DATATYPE) == 8) epsi = 1.0E-13; else epsi = 1.0E-13;
else throw badtype();
if (erra > epsi) if (erra > epsi)
std::cout std::cout
@ -156,7 +167,10 @@ int main(int argc, char *argv[])
try try
{ {
program.build(); std::string options = "";
if (useFloat)
options = "-DFLOAT";
program.build(options.c_str());
} }
catch (cl::Error& e) catch (cl::Error& e)
{ {
@ -175,19 +189,36 @@ int main(int argc, char *argv[])
cl::make_kernel<cl::Buffer, cl::Buffer, cl::Buffer> triad(program, "triad"); cl::make_kernel<cl::Buffer, cl::Buffer, cl::Buffer> triad(program, "triad");
// Create host vectors // Create host vectors
std::vector<DATATYPE> h_a(ARRAY_SIZE, 1.0); void *h_a = malloc(ARRAY_SIZE * DATATYPE_SIZE);
std::vector<DATATYPE> h_b(ARRAY_SIZE, 2.0); void *h_b = malloc(ARRAY_SIZE * DATATYPE_SIZE);
std::vector<DATATYPE> h_c(ARRAY_SIZE, 0.0); void *h_c = malloc(ARRAY_SIZE * DATATYPE_SIZE);
// Initilise arrays
for (unsigned int i = 0; i < ARRAY_SIZE; i++)
{
if (useFloat)
{
((float*)h_a)[i] = 1.0;
((float*)h_b)[i] = 2.0;
((float*)h_c)[i] = 0.0;
}
else
{
((double*)h_a)[i] = 1.0;
((double*)h_b)[i] = 2.0;
((double*)h_c)[i] = 0.0;
}
}
// Create device buffers // Create device buffers
cl::Buffer d_a(context, CL_MEM_READ_WRITE, sizeof(DATATYPE) * ARRAY_SIZE); cl::Buffer d_a(context, CL_MEM_READ_WRITE, DATATYPE_SIZE * ARRAY_SIZE);
cl::Buffer d_b(context, CL_MEM_READ_WRITE, sizeof(DATATYPE) * ARRAY_SIZE); cl::Buffer d_b(context, CL_MEM_READ_WRITE, DATATYPE_SIZE * ARRAY_SIZE);
cl::Buffer d_c(context, CL_MEM_READ_WRITE, sizeof(DATATYPE) * ARRAY_SIZE); cl::Buffer d_c(context, CL_MEM_READ_WRITE, DATATYPE_SIZE * ARRAY_SIZE);
// Copy host memory to device // Copy host memory to device
cl::copy(queue, h_a.begin(), h_a.end(), d_a); queue.enqueueWriteBuffer(d_a, CL_FALSE, 0, ARRAY_SIZE*DATATYPE_SIZE, h_a);
cl::copy(queue, h_b.begin(), h_b.end(), d_b); queue.enqueueWriteBuffer(d_b, CL_FALSE, 0, ARRAY_SIZE*DATATYPE_SIZE, h_b);
cl::copy(queue, h_c.begin(), h_c.end(), d_c); queue.enqueueWriteBuffer(d_c, CL_FALSE, 0, ARRAY_SIZE*DATATYPE_SIZE, h_c);
// Make sure the copies are finished // Make sure the copies are finished
queue.finish(); queue.finish();
@ -250,9 +281,10 @@ int main(int argc, char *argv[])
} }
// Check solutions // Check solutions
cl::copy(queue, d_a, h_a.begin(), h_a.end()); queue.enqueueReadBuffer(d_a, CL_FALSE, 0, ARRAY_SIZE*DATATYPE_SIZE, h_a);
cl::copy(queue, d_b, h_b.begin(), h_b.end()); queue.enqueueReadBuffer(d_b, CL_FALSE, 0, ARRAY_SIZE*DATATYPE_SIZE, h_b);
cl::copy(queue, d_c, h_c.begin(), h_c.end()); queue.enqueueReadBuffer(d_c, CL_FALSE, 0, ARRAY_SIZE*DATATYPE_SIZE, h_c);
queue.finish();
check_solution(h_a, h_b, h_c); check_solution(h_a, h_b, h_c);
// Crunch results // Crunch results
@ -403,6 +435,11 @@ void parseArguments(int argc, char *argv[])
exit(1); exit(1);
} }
} }
else if (!strcmp(argv[i], "--float"))
{
useFloat = true;
DATATYPE_SIZE = sizeof(float);
}
else if (!strcmp(argv[i], "--help") || !strcmp(argv[i], "-h")) else if (!strcmp(argv[i], "--help") || !strcmp(argv[i], "-h"))
{ {
std::cout << std::endl; std::cout << std::endl;
@ -413,6 +450,7 @@ void parseArguments(int argc, char *argv[])
std::cout << " --device INDEX Select device at INDEX" << std::endl; std::cout << " --device INDEX Select device at INDEX" << std::endl;
std::cout << " -s --arraysize SIZE Use SIZE elements in the array" << std::endl; std::cout << " -s --arraysize SIZE Use SIZE elements in the array" << std::endl;
std::cout << " -n --numtimes NUM Run the test NUM times (NUM >= 2)" << std::endl; std::cout << " -n --numtimes NUM Run the test NUM times (NUM >= 2)" << std::endl;
std::cout << " --float Use floats (rather than doubles)" << std::endl;
std::cout << std::endl; std::cout << std::endl;
exit(0); exit(0);
} }