Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Code-style consistency improvement:

Browse Source 
Apply clang-format-all.sh using the _clang-format file through all the cpp/.h files.
make sure not to apply it to certain serialization structures, since some parser expects the * as part of the name, instead of type.
This commit contains no other changes aside from adding and applying clang-format-all.sh
This commit is contained in:
erwincoumans
2018-09-23 14:17:31 -07:00
parent b73b05e9fb
commit ab8f16961e
1773 changed files with 1081087 additions and 474249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

397
test/OpenCL/AllBullet3Kernels/testExecuteBullet3NarrowphaseKernels.cpp
View File

@@ -21,51 +21,49 @@ extern char** gArgv;
namespace
{
struct ExecuteBullet3NarrowphaseKernels : public ::testing::Test
struct ExecuteBullet3NarrowphaseKernels : public ::testing::Test
{
cl_context m_clContext;
cl_device_id m_clDevice;
cl_command_queue m_clQueue;
char* m_clDeviceName;
cl_platform_id m_platformId;
ExecuteBullet3NarrowphaseKernels()
: m_clDeviceName(0),
m_clContext(0),
m_clDevice(0),
m_clQueue(0),
m_platformId(0)
{
cl_context m_clContext;
cl_device_id m_clDevice;
cl_command_queue m_clQueue;
char* m_clDeviceName;
cl_platform_id m_platformId;
// You can do set-up work for each test here.
ExecuteBullet3NarrowphaseKernels()
:m_clDeviceName(0),
m_clContext(0),
m_clDevice(0),
m_clQueue(0),
m_platformId(0)
{
// You can do set-up work for each test here.
initCL();
}
initCL();
}
virtual ~ExecuteBullet3NarrowphaseKernels()
{
// You can do clean-up work that doesn't throw exceptions here.
exitCL();
}
virtual ~ExecuteBullet3NarrowphaseKernels()
{
// You can do clean-up work that doesn't throw exceptions here.
exitCL();
}
// If the constructor and destructor are not enough for setting up
// and cleaning up each test, you can define the following methods:
// If the constructor and destructor are not enough for setting up
// and cleaning up each test, you can define the following methods:
#include "initCL.h"
#include "initCL.h"
virtual void SetUp()
{
// Code here will be called immediately after the constructor (right
// before each test).
}
virtual void SetUp()
{
// Code here will be called immediately after the constructor (right
// before each test).
}
virtual void TearDown()
{
// Code here will be called immediately after each test (right
// before the destructor).
}
};
virtual void TearDown()
{
// Code here will be called immediately after each test (right
// before the destructor).
}
};
#if 0
TEST_F(ExecuteBullet3NarrowphaseKernels,satKernelsCL)
@@ -244,196 +242,191 @@ namespace
#endif
unsigned char* openFile(const char* fileName, int* sizeInBytesPtr)
{
*sizeInBytesPtr=0;
unsigned char* buffer = 0;
const char* prefix[]={"./","./data/","../data/","../../data/","../../../data/","../../../../data/"};
int numPrefixes = sizeof(prefix)/sizeof(const char*);
char relativeFileName[1024];
unsigned char* openFile(const char* fileName, int* sizeInBytesPtr)
{
*sizeInBytesPtr = 0;
unsigned char* buffer = 0;
const char* prefix[] = {"./", "./data/", "../data/", "../../data/", "../../../data/", "../../../../data/"};
int numPrefixes = sizeof(prefix) / sizeof(const char*);
char relativeFileName[1024];
#ifdef B3_USE_ZLIB
{
FILE* f = 0;
int result = 0;
for (int i = 0; !f && i < numPrefixes; i++)
{
FILE* f=0;
int result = 0;
sprintf(relativeFileName, "%s%s", prefix[i], "unittest_data.zip");
f = fopen(relativeFileName, "rb");
}
if (f)
{
fclose(f);
for (int i=0;!f && i<numPrefixes;i++)
unzFile zipfile = unzOpen(relativeFileName);
if (zipfile == NULL)
{
sprintf(relativeFileName,"%s%s",prefix[i],"unittest_data.zip");
f = fopen(relativeFileName,"rb");
printf("%s: not found\n", relativeFileName);
}
if (f)
// Get info about the zip file
unz_global_info global_info;
result = unzGetGlobalInfo(zipfile, &global_info);
if (result != UNZ_OK)
{
fclose(f);
unzFile zipfile = unzOpen( relativeFileName);
if ( zipfile == NULL )
b3Printf("could not read file global info\n");
unzClose(zipfile);
}
else
{
result = unzLocateFile(zipfile, fileName, 0);
if (result == UNZ_OK)
{
printf( "%s: not found\n" ,relativeFileName);
}
// Get info about the zip file
unz_global_info global_info;
result = unzGetGlobalInfo( zipfile, &global_info ) ;
if (result != UNZ_OK )
{
b3Printf( "could not read file global info\n" );
unzClose( zipfile );
} else
{
result = unzLocateFile(zipfile, fileName, 0);
if (result == UNZ_OK)
unz_file_info info;
result = unzGetCurrentFileInfo(zipfile, &info, NULL, 0, NULL, 0, NULL, 0);
if (result != UNZ_OK)
{
unz_file_info info;
result = unzGetCurrentFileInfo( zipfile, &info, NULL, 0, NULL, 0, NULL, 0 );
if ( result != UNZ_OK )
{
b3Printf("unzGetCurrentFileInfo() != UNZ_OK (%d)\n", result);
} else
{
result = unzOpenCurrentFile(zipfile);
if (result == UNZ_OK)
{
buffer = (unsigned char*)malloc(info.uncompressed_size);
result = unzReadCurrentFile(zipfile,buffer,info.uncompressed_size);
if (result <0)
{
free(buffer);
buffer=0;
} else
{
*sizeInBytesPtr= info.uncompressed_size;
}
unzCloseCurrentFile(zipfile);
} else
{
b3Printf("cannot open file %s!\n", fileName);
}
}
} else
{
b3Printf("cannot find file %s\n", fileName);
b3Printf("unzGetCurrentFileInfo() != UNZ_OK (%d)\n", result);
}
else
{
result = unzOpenCurrentFile(zipfile);
if (result == UNZ_OK)
{
buffer = (unsigned char*)malloc(info.uncompressed_size);
result = unzReadCurrentFile(zipfile, buffer, info.uncompressed_size);
if (result < 0)
{
free(buffer);
buffer = 0;
}
else
{
*sizeInBytesPtr = info.uncompressed_size;
}
unzCloseCurrentFile(zipfile);
}
else
{
b3Printf("cannot open file %s!\n", fileName);
}
}
unzClose( zipfile );
}
else
{
b3Printf("cannot find file %s\n", fileName);
}
unzClose(zipfile);
}
}
#endif//B3_USE_ZLIB
if (!buffer)
{
FILE* f=0;
int result = 0;
for (int i=0;!f && i<numPrefixes;i++)
{
sprintf(relativeFileName,"%s%s",prefix[i],fileName);
f = fopen(relativeFileName,"rb");
}
//first try from data.zip, otherwise directly load the file from disk
if (f)
{
int sizeInBytes=0;
if (fseek(f, 0, SEEK_END) || (sizeInBytes = ftell(f)) == EOF || fseek(f, 0, SEEK_SET))
{
b3Printf("error, cannot get file size\n");
}
buffer = (unsigned char*) malloc(sizeInBytes);
int actualRead = fread(buffer,sizeInBytes,1,f);
if (actualRead != 1)
{
free(buffer);
buffer=0;
} else
{
*sizeInBytesPtr = sizeInBytes;
}
fclose(f);
}
}
return buffer;
}
void testLauncher(const char* fileName2, b3LauncherCL& launcher, cl_context ctx)
#endif //B3_USE_ZLIB
if (!buffer)
{
FILE* f = 0;
int result = 0;
int sizeInBytes=0;
unsigned char* buf = openFile(fileName2,&sizeInBytes);
ASSERT_FALSE(buf==NULL);
if (buf)
for (int i = 0; !f && i < numPrefixes; i++)
{
int serializedBytes = launcher.deserializeArgs(buf, sizeInBytes,ctx);
int num = *(int*)&buf[serializedBytes];
launcher.launch1D( num);
free(buf);
//this clFinish is for testing on errors
sprintf(relativeFileName, "%s%s", prefix[i], fileName);
f = fopen(relativeFileName, "rb");
}
}
TEST_F(ExecuteBullet3NarrowphaseKernels,mprKernelsCL)
{
cl_int errNum=0;
const char* srcConcave = satConcaveKernelsCL;
char flags[1024]={0};
cl_program mprProg = b3OpenCLUtils::compileCLProgramFromString(m_clContext,m_clDevice,mprKernelsCL,&errNum,flags,0,true);
ASSERT_EQ(CL_SUCCESS,errNum);
//first try from data.zip, otherwise directly load the file from disk
if (f)
{
cl_kernel k = b3OpenCLUtils::compileCLKernelFromString(m_clContext, m_clDevice,mprKernelsCL, "mprPenetrationKernel",&errNum,mprProg );
ASSERT_EQ(CL_SUCCESS,errNum);
if (1)
int sizeInBytes = 0;
if (fseek(f, 0, SEEK_END) || (sizeInBytes = ftell(f)) == EOF || fseek(f, 0, SEEK_SET))
{
const char* fileNames[]={"mprPenetrationKernel60.bin","mprPenetrationKernel61.bin","mprPenetrationKernel70.bin","mprPenetrationKernel128.bin"};
int results[] = {0,1,46,98};
int numTests = sizeof(fileNames)/sizeof(const char*);
for (int i=0;i<numTests;i++)
{
b3LauncherCL launcher(m_clQueue, k,fileNames[i]);
testLauncher(fileNames[i],launcher, m_clContext);
clFinish(m_clQueue);
ASSERT_EQ(launcher.getNumArguments(),11);
b3KernelArgData data = launcher.getArgument(8);
ASSERT_TRUE(data.m_isBuffer);
b3OpenCLArray<int> totalContactsOut(this->m_clContext,this->m_clQueue);
totalContactsOut.setFromOpenCLBuffer(data.m_clBuffer,1);
int numContacts = totalContactsOut.at(0);
ASSERT_EQ(results[i],numContacts);
}
//printf("numContacts = %d\n",numContacts);
//nContacts = m_totalContactsOut.at(0);
b3Printf("error, cannot get file size\n");
}
clReleaseKernel(k);
buffer = (unsigned char*)malloc(sizeInBytes);
int actualRead = fread(buffer, sizeInBytes, 1, f);
if (actualRead != 1)
{
free(buffer);
buffer = 0;
}
else
{
*sizeInBytesPtr = sizeInBytes;
}
fclose(f);
}
{
cl_kernel k = b3OpenCLUtils::compileCLKernelFromString(m_clContext, m_clDevice,mprKernelsCL, "findSeparatingAxisUnitSphereKernel",&errNum,mprProg );
ASSERT_EQ(CL_SUCCESS,errNum);
clReleaseKernel(k);
}
clReleaseProgram(mprProg);
}
return buffer;
}
};
void testLauncher(const char* fileName2, b3LauncherCL& launcher, cl_context ctx)
{
int sizeInBytes = 0;
unsigned char* buf = openFile(fileName2, &sizeInBytes);
ASSERT_FALSE(buf == NULL);
if (buf)
{
int serializedBytes = launcher.deserializeArgs(buf, sizeInBytes, ctx);
int num = *(int*)&buf[serializedBytes];
launcher.launch1D(num);
free(buf);
//this clFinish is for testing on errors
}
}
TEST_F(ExecuteBullet3NarrowphaseKernels, mprKernelsCL)
{
cl_int errNum = 0;
const char* srcConcave = satConcaveKernelsCL;
char flags[1024] = {0};
cl_program mprProg = b3OpenCLUtils::compileCLProgramFromString(m_clContext, m_clDevice, mprKernelsCL, &errNum, flags, 0, true);
ASSERT_EQ(CL_SUCCESS, errNum);
{
cl_kernel k = b3OpenCLUtils::compileCLKernelFromString(m_clContext, m_clDevice, mprKernelsCL, "mprPenetrationKernel", &errNum, mprProg);
ASSERT_EQ(CL_SUCCESS, errNum);
if (1)
{
const char* fileNames[] = {"mprPenetrationKernel60.bin", "mprPenetrationKernel61.bin", "mprPenetrationKernel70.bin", "mprPenetrationKernel128.bin"};
int results[] = {0, 1, 46, 98};
int numTests = sizeof(fileNames) / sizeof(const char*);
for (int i = 0; i < numTests; i++)
{
b3LauncherCL launcher(m_clQueue, k, fileNames[i]);
testLauncher(fileNames[i], launcher, m_clContext);
clFinish(m_clQueue);
ASSERT_EQ(launcher.getNumArguments(), 11);
b3KernelArgData data = launcher.getArgument(8);
ASSERT_TRUE(data.m_isBuffer);
b3OpenCLArray<int> totalContactsOut(this->m_clContext, this->m_clQueue);
totalContactsOut.setFromOpenCLBuffer(data.m_clBuffer, 1);
int numContacts = totalContactsOut.at(0);
ASSERT_EQ(results[i], numContacts);
}
//printf("numContacts = %d\n",numContacts);
//nContacts = m_totalContactsOut.at(0);
}
clReleaseKernel(k);
}
{
cl_kernel k = b3OpenCLUtils::compileCLKernelFromString(m_clContext, m_clDevice, mprKernelsCL, "findSeparatingAxisUnitSphereKernel", &errNum, mprProg);
ASSERT_EQ(CL_SUCCESS, errNum);
clReleaseKernel(k);
}
clReleaseProgram(mprProg);
}
}; // namespace