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

Fixed signed/unsigned comparison warnings.

Browse Source
This commit is contained in:
James Price 2015-08-19 15:37:31 +01:00
parent 034c00c301
commit 429bba547b
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
common.cpp
View File

@ -38,18 +38,18 @@
// Default array size 50 * 2^20 (50*8 Mebibytes double precision) // Default array size 50 * 2^20 (50*8 Mebibytes double precision)
// Use binary powers of two so divides 1024 // Use binary powers of two so divides 1024
int ARRAY_SIZE = 52428800; unsigned int ARRAY_SIZE = 52428800;
int NTIMES = 10; unsigned int NTIMES = 10;
bool useFloat = false; bool useFloat = false;
int deviceIndex = 0; unsigned int deviceIndex = 0;
int parseInt(const char *str, int *output) int parseUInt(const char *str, unsigned int *output)
{ {
char *next; char *next;
*output = strtol(str, &next, 10); *output = strtoul(str, &next, 10);
return !strlen(next); return !strlen(next);
} }
@ -64,7 +64,7 @@ void parseArguments(int argc, char *argv[])
} }
else if (!strcmp(argv[i], "--device")) else if (!strcmp(argv[i], "--device"))
{ {
if (++i >= argc || !parseInt(argv[i], &deviceIndex)) if (++i >= argc || !parseUInt(argv[i], &deviceIndex))
{ {
std::cout << "Invalid device index" << std::endl; std::cout << "Invalid device index" << std::endl;
exit(1); exit(1);
@ -72,7 +72,7 @@ void parseArguments(int argc, char *argv[])
} }
else if (!strcmp(argv[i], "--arraysize") || !strcmp(argv[i], "-s")) else if (!strcmp(argv[i], "--arraysize") || !strcmp(argv[i], "-s"))
{ {
if (++i >= argc || !parseInt(argv[i], &ARRAY_SIZE)) if (++i >= argc || !parseUInt(argv[i], &ARRAY_SIZE))
{ {
std::cout << "Invalid array size" << std::endl; std::cout << "Invalid array size" << std::endl;
exit(1); exit(1);
@ -80,7 +80,7 @@ void parseArguments(int argc, char *argv[])
} }
else if (!strcmp(argv[i], "--numtimes") || !strcmp(argv[i], "-n")) else if (!strcmp(argv[i], "--numtimes") || !strcmp(argv[i], "-n"))
{ {
if (++i >= argc || !parseInt(argv[i], &NTIMES)) if (++i >= argc || !parseUInt(argv[i], &NTIMES))
{ {
std::cout << "Invalid number of times" << std::endl; std::cout << "Invalid number of times" << std::endl;
exit(1); exit(1);

6
common.h
View File

@ -47,12 +47,12 @@ extern void parseArguments(int argc, char *argv[]);
extern void listDevices(void); extern void listDevices(void);
extern int ARRAY_SIZE; extern unsigned int ARRAY_SIZE;
extern int NTIMES; extern unsigned int NTIMES;
extern bool useFloat; extern bool useFloat;
extern int deviceIndex; extern unsigned int deviceIndex;
template < typename T > template < typename T >