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

more bt* to b3*

Browse Source
This commit is contained in:
erwin coumans
2013-04-16 17:08:59 -07:00
parent faabffc23d
commit e646754228
116 changed files with 2466 additions and 3034 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
opencl/parallel_primitives/benchmark/premake4.lua
View File

@@ -24,11 +24,11 @@ function createProject(vendor)
"../host/btFillCL.cpp",
"../host/btPrefixScanCL.cpp",
"../host/btRadixSort32CL.cpp",
"../../../src/BulletCommon/btAlignedAllocator.cpp",
"../../../src/BulletCommon/btAlignedAllocator.h",
"../../../src/BulletCommon/btAlignedObjectArray.h",
"../../../src/BulletCommon/btQuickprof.cpp",
"../../../src/BulletCommon/btQuickprof.h",
"../../../src/BulletCommon/b3AlignedAllocator.cpp",
"../../../src/BulletCommon/b3AlignedAllocator.h",
"../../../src/BulletCommon/b3AlignedObjectArray.h",
"../../../src/BulletCommon/b3Quickprof.cpp",
"../../../src/BulletCommon/b3Quickprof.h",
}
end

20
opencl/parallel_primitives/benchmark/test_large_problem_sorting.cpp
View File

@@ -66,7 +66,7 @@
#include "../host/btRadixSort32CL.h"
#include "../../basic_initialize/b3OpenCLUtils.h"
#include "BulletCommon/btQuickprof.h"
#include "BulletCommon/b3Quickprof.h"
cl_context g_cxMainContext;
cl_device_id g_device;
@@ -112,7 +112,7 @@ void TimedSort(
printf("Keys only, %d iterations, %d elements\n", iterations, num_elements);
int max_elements = num_elements;
btAlignedObjectArray<unsigned int> hostData;
b3AlignedObjectArray<unsigned int> hostData;
hostData.resize(num_elements);
for (int i=0;i<num_elements;i++)
{
@@ -126,7 +126,7 @@ void TimedSort(
//sorter.executeHost(gpuData);
sorter.execute(gpuData);
btAlignedObjectArray<unsigned int> hostDataSorted;
b3AlignedObjectArray<unsigned int> hostDataSorted;
gpuData.copyToHost(hostDataSorted);
clFinish(g_cqCommandQueue);
@@ -218,7 +218,7 @@ void TimedSort(
printf("Key-values, %d iterations, %d elements\n", iterations, num_elements);
int max_elements = num_elements;
btAlignedObjectArray<btSortData> hostData;
b3AlignedObjectArray<btSortData> hostData;
hostData.resize(num_elements);
for (int i=0;i<num_elements;i++)
{
@@ -233,7 +233,7 @@ void TimedSort(
//sorter.executeHost(gpuData);
sorter.execute(gpuData);
btAlignedObjectArray<btSortData> hostDataSorted;
b3AlignedObjectArray<btSortData> hostDataSorted;
gpuData.copyToHost(hostDataSorted);
#if 0
for (int i=0;i<num_elements;i++)
@@ -549,7 +549,7 @@ void Usage()
#include <algorithm>
#include <string>
class CommandLineArgs
class b3CommandLineArgs
{
protected:
@@ -558,7 +558,7 @@ protected:
public:
// Constructor
CommandLineArgs(int argc, char **argv)
b3CommandLineArgs(int argc, char **argv)
{
using namespace std;
@@ -603,7 +603,7 @@ public:
};
template <typename T>
void CommandLineArgs::GetCmdLineArgument(const char *arg_name, T &val)
void b3CommandLineArgs::GetCmdLineArgument(const char *arg_name, T &val)
{
using namespace std;
map<string, string>::iterator itr;
@@ -614,7 +614,7 @@ void CommandLineArgs::GetCmdLineArgument(const char *arg_name, T &val)
}
template <>
void CommandLineArgs::GetCmdLineArgument<char*>(const char* arg_name, char* &val)
void b3CommandLineArgs::GetCmdLineArgument<char*>(const char* arg_name, char* &val)
{
using namespace std;
map<string, string>::iterator itr;
@@ -644,7 +644,7 @@ int main( int argc, char** argv)
gDebugSkipLoadingBinary = true;
cl_int ciErrNum;
CommandLineArgs args(argc,argv);
b3CommandLineArgs args(argc,argv);
args.GetCmdLineArgument("deviceId", gPreferredDeviceId);
args.GetCmdLineArgument("platformId", gPreferredPlatformId);

8
opencl/parallel_primitives/host/btBoundSearchCL.cpp
View File

@@ -138,8 +138,8 @@ void btBoundSearchCL::execute(btOpenCLArray<btSortData>& src, int nSrc, btOpenCL
}
void btBoundSearchCL::executeHost( btAlignedObjectArray<btSortData>& src, int nSrc,
btAlignedObjectArray<unsigned int>& dst, int nDst, Option option )
void btBoundSearchCL::executeHost( b3AlignedObjectArray<btSortData>& src, int nSrc,
b3AlignedObjectArray<unsigned int>& dst, int nDst, Option option )
{
@@ -188,9 +188,9 @@ void btBoundSearchCL::executeHost( btAlignedObjectArray<btSortData>& src, int nS
}
else if( option == COUNT )
{
btAlignedObjectArray<unsigned int> lower;
b3AlignedObjectArray<unsigned int> lower;
lower.resize(nDst );
btAlignedObjectArray<unsigned int> upper;
b3AlignedObjectArray<unsigned int> upper;
upper.resize(nDst );
for(int i=0; i<nDst; i++)

2
opencl/parallel_primitives/host/btBoundSearchCL.h
View File

@@ -60,7 +60,7 @@ class btBoundSearchCL
// src has to be src[i].m_key <= src[i+1].m_key
void execute( btOpenCLArray<btSortData>& src, int nSrc, btOpenCLArray<unsigned int>& dst, int nDst, Option option = BOUND_LOWER );
void executeHost( btAlignedObjectArray<btSortData>& src, int nSrc, btAlignedObjectArray<unsigned int>& dst, int nDst, Option option = BOUND_LOWER);
void executeHost( b3AlignedObjectArray<btSortData>& src, int nSrc, b3AlignedObjectArray<unsigned int>& dst, int nDst, Option option = BOUND_LOWER);
};

4
opencl/parallel_primitives/host/btFillCL.cpp
View File

@@ -90,7 +90,7 @@ void btFillCL::execute(btOpenCLArray<unsigned int>& src, const unsigned int valu
}
}
void btFillCL::executeHost(btAlignedObjectArray<btInt2> &src, const btInt2 &value, int n, int offset)
void btFillCL::executeHost(b3AlignedObjectArray<btInt2> &src, const btInt2 &value, int n, int offset)
{
for (int i=0;i<n;i++)
{
@@ -98,7 +98,7 @@ void btFillCL::executeHost(btAlignedObjectArray<btInt2> &src, const btInt2 &valu
}
}
void btFillCL::executeHost(btAlignedObjectArray<int> &src, const int value, int n, int offset)
void btFillCL::executeHost(b3AlignedObjectArray<int> &src, const int value, int n, int offset)
{
for (int i=0;i<n;i++)
{

6
opencl/parallel_primitives/host/btFillCL.h
View File

@@ -2,7 +2,7 @@
#define BT_FILL_CL_H
#include "btOpenCLArray.h"
#include "BulletCommon/btScalar.h"
#include "BulletCommon/b3Scalar.h"
#include "btInt2.h"
#include "btInt4.h"
@@ -48,9 +48,9 @@ public:
void execute(btOpenCLArray<btInt2>& src, const btInt2& value, int n, int offset = 0);
void executeHost(btAlignedObjectArray<btInt2> &src, const btInt2 &value, int n, int offset);
void executeHost(b3AlignedObjectArray<btInt2> &src, const btInt2 &value, int n, int offset);
void executeHost(btAlignedObjectArray<int> &src, const int value, int n, int offset);
void executeHost(b3AlignedObjectArray<int> &src, const int value, int n, int offset);
// void execute(btOpenCLArray<btInt4>& src, const btInt4& value, int n, int offset = 0);

2
opencl/parallel_primitives/host/btInt4.h
View File

@@ -1,7 +1,7 @@
#ifndef BT_INT4_H
#define BT_INT4_H
#include "BulletCommon/btScalar.h"
#include "BulletCommon/b3Scalar.h"
ATTRIBUTE_ALIGNED16(struct) btUnsignedInt4
{

6
opencl/parallel_primitives/host/btLauncherCL.h
View File

@@ -3,7 +3,7 @@
#define BT_LAUNCHER_CL_H
#include "btBufferInfoCL.h"
#include "BulletCommon/btMinMax.h"
#include "BulletCommon/b3MinMax.h"
#include "btOpenCLArray.h"
#include <stdio.h>
@@ -31,14 +31,14 @@ class btLauncherCL
cl_kernel m_kernel;
int m_idx;
btAlignedObjectArray<btKernelArgData> m_kernelArguments;
b3AlignedObjectArray<btKernelArgData> m_kernelArguments;
int m_serializationSizeInBytes;
public:
btAlignedObjectArray<btOpenCLArray<unsigned char>* > m_arrays;
b3AlignedObjectArray<btOpenCLArray<unsigned char>* > m_arrays;
btLauncherCL(cl_command_queue queue, cl_kernel kernel)
:m_commandQueue(queue),

8
opencl/parallel_primitives/host/btOpenCLArray.h
View File

@@ -1,7 +1,7 @@
#ifndef BT_OPENCL_ARRAY_H
#define BT_OPENCL_ARRAY_H
#include "BulletCommon/btAlignedObjectArray.h"
#include "BulletCommon/b3AlignedObjectArray.h"
#include "../../basic_initialize/b3OpenCLInclude.h"
template <typename T>
@@ -61,7 +61,7 @@ public:
}
// we could enable this assignment, but need to make sure to avoid accidental deep copies
// btOpenCLArray<T>& operator=(const btAlignedObjectArray<T>& src)
// btOpenCLArray<T>& operator=(const b3AlignedObjectArray<T>& src)
// {
// copyFromArray(src);
// return *this;
@@ -212,7 +212,7 @@ public:
btAssert( status == CL_SUCCESS );
}
void copyFromHost(const btAlignedObjectArray<T>& srcArray, bool waitForCompletion=true)
void copyFromHost(const b3AlignedObjectArray<T>& srcArray, bool waitForCompletion=true)
{
int newSize = srcArray.size();
@@ -238,7 +238,7 @@ public:
}
void copyToHost(btAlignedObjectArray<T>& destArray, bool waitForCompletion=true) const
void copyToHost(b3AlignedObjectArray<T>& destArray, bool waitForCompletion=true) const
{
destArray.resize(this->size());
if (size())

2
opencl/parallel_primitives/host/btPrefixScanCL.cpp
View File

@@ -98,7 +98,7 @@ void btPrefixScanCL::execute(btOpenCLArray<unsigned int>& src, btOpenCLArray<uns
}
void btPrefixScanCL::executeHost(btAlignedObjectArray<unsigned int>& src, btAlignedObjectArray<unsigned int>& dst, int n, unsigned int* sum)
void btPrefixScanCL::executeHost(b3AlignedObjectArray<unsigned int>& src, b3AlignedObjectArray<unsigned int>& dst, int n, unsigned int* sum)
{
unsigned int s = 0;
//if( data->m_option == EXCLUSIVE )

4
opencl/parallel_primitives/host/btPrefixScanCL.h
View File

@@ -4,7 +4,7 @@
#include "btOpenCLArray.h"
#include "btBufferInfoCL.h"
#include "BulletCommon/btAlignedObjectArray.h"
#include "BulletCommon/b3AlignedObjectArray.h"
class btPrefixScanCL
{
@@ -31,7 +31,7 @@ class btPrefixScanCL
virtual ~btPrefixScanCL();
void execute(btOpenCLArray<unsigned int>& src, btOpenCLArray<unsigned int>& dst, int n, unsigned int* sum = 0);
void executeHost(btAlignedObjectArray<unsigned int>& src, btAlignedObjectArray<unsigned int>& dst, int n, unsigned int* sum);
void executeHost(b3AlignedObjectArray<unsigned int>& src, b3AlignedObjectArray<unsigned int>& dst, int n, unsigned int* sum);
};
#endif //BT_PREFIX_SCAN_CL_H

20
opencl/parallel_primitives/host/btRadixSort32CL.cpp
View File

@@ -93,7 +93,7 @@ btRadixSort32CL::~btRadixSort32CL()
clReleaseKernel(m_prefixScanKernel);
}
void btRadixSort32CL::executeHost(btAlignedObjectArray<btSortData>& inout, int sortBits /* = 32 */)
void btRadixSort32CL::executeHost(b3AlignedObjectArray<btSortData>& inout, int sortBits /* = 32 */)
{
int n = inout.size();
const int BITS_PER_PASS = 8;
@@ -104,7 +104,7 @@ void btRadixSort32CL::executeHost(btAlignedObjectArray<btSortData>& inout, int s
int counter[NUM_TABLES];
btSortData* src = &inout[0];
btAlignedObjectArray<btSortData> workbuffer;
b3AlignedObjectArray<btSortData> workbuffer;
workbuffer.resize(inout.size());
btSortData* dst = &workbuffer[0];
@@ -166,7 +166,7 @@ void btRadixSort32CL::executeHost(btAlignedObjectArray<btSortData>& inout, int s
void btRadixSort32CL::executeHost(btOpenCLArray<btSortData>& keyValuesInOut, int sortBits /* = 32 */)
{
btAlignedObjectArray<btSortData> inout;
b3AlignedObjectArray<btSortData> inout;
keyValuesInOut.copyToHost(inout);
executeHost(inout,sortBits);
@@ -194,7 +194,7 @@ void btRadixSort32CL::execute(btOpenCLArray<btSortData>& keyValuesInOut, int sor
int dataAlignment = DATA_ALIGNMENT;
#ifdef DEBUG_RADIXSORT2
btAlignedObjectArray<btSortData> test2;
b3AlignedObjectArray<btSortData> test2;
keyValuesInOut.copyToHost(test2);
printf("numElem = %d\n",test2.size());
for (int i=0;i<test2.size();i++)
@@ -307,7 +307,7 @@ void btRadixSort32CL::execute(btOpenCLArray<btSortData>& keyValuesInOut, int sor
#ifdef DEBUG_RADIXSORT
btAlignedObjectArray<unsigned int> testHist;
b3AlignedObjectArray<unsigned int> testHist;
srcHisto->copyToHost(testHist);
printf("ib = %d, testHist size = %d, non zero elements:\n",ib, testHist.size());
for (int i=0;i<testHist.size();i++)
@@ -379,8 +379,8 @@ void btRadixSort32CL::execute(btOpenCLArray<btSortData>& keyValuesInOut, int sor
int startBit = ib;
destHisto->copyToHost(testHist);
btAlignedObjectArray<btSortData> srcHost;
btAlignedObjectArray<btSortData> dstHost;
b3AlignedObjectArray<btSortData> srcHost;
b3AlignedObjectArray<btSortData> dstHost;
dstHost.resize(src->size());
src->copyToHost(srcHost);
@@ -405,11 +405,11 @@ void btRadixSort32CL::execute(btOpenCLArray<btSortData>& keyValuesInOut, int sor
int counter2[NUM_TABLES]={0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
int tables[NUM_TABLES];
btAlignedObjectArray<btSortData> dstHostOK;
b3AlignedObjectArray<btSortData> dstHostOK;
dstHostOK.resize(src->size());
destHisto->copyToHost(testHist);
btAlignedObjectArray<btSortData> srcHost;
b3AlignedObjectArray<btSortData> srcHost;
src->copyToHost(srcHost);
int blockSize = 256;
@@ -435,7 +435,7 @@ void btRadixSort32CL::execute(btOpenCLArray<btSortData>& keyValuesInOut, int sor
}
btAlignedObjectArray<btSortData> dstHost;
b3AlignedObjectArray<btSortData> dstHost;
dstHost.resize(src->size());

2
opencl/parallel_primitives/host/btRadixSort32CL.h
View File

@@ -78,7 +78,7 @@ public:
void execute(btOpenCLArray<btSortData>& keyValuesInOut, int sortBits = 32 );
void executeHost(btOpenCLArray<btSortData>& keyValuesInOut, int sortBits = 32);
void executeHost(btAlignedObjectArray<btSortData>& keyValuesInOut, int sortBits = 32);
void executeHost(b3AlignedObjectArray<btSortData>& keyValuesInOut, int sortBits = 32);
};
#endif //BT_RADIXSORT32_H

28
opencl/parallel_primitives/test/main.cpp
View File

@@ -19,8 +19,8 @@ subject to the following restrictions:
#include "../host/btBoundSearchCL.h"
#include "../host/btRadixSort32CL.h"
#include "../host/btPrefixScanCL.h"
#include "BulletCommon/CommandLineArgs.h"
#include "BulletCommon/btMinMax.h"
#include "BulletCommon/b3CommandLineArgs.h"
#include "BulletCommon/b3MinMax.h"
int g_nPassed = 0;
int g_nFailed = 0;
@@ -89,11 +89,11 @@ inline void fillIntTest()
int offset=0;
fillCL->execute(intBuffer,value,size,offset);
btAlignedObjectArray<int> hostBuf2;
b3AlignedObjectArray<int> hostBuf2;
hostBuf2.resize(size);
fillCL->executeHost(hostBuf2,value,size,offset);
btAlignedObjectArray<int> hostBuf;
b3AlignedObjectArray<int> hostBuf;
intBuffer.copyToHost(hostBuf);
for(int i=0; i<size; i++)
@@ -146,11 +146,11 @@ void boundSearchTest( )
btOpenCLArray<unsigned int> upperCL(g_context,g_queue,maxSize);
btOpenCLArray<unsigned int> lowerCL(g_context,g_queue,maxSize);
btAlignedObjectArray<btSortData> srcHost;
btAlignedObjectArray<unsigned int> upperHost;
btAlignedObjectArray<unsigned int> lowerHost;
btAlignedObjectArray<unsigned int> upperHostCompare;
btAlignedObjectArray<unsigned int> lowerHostCompare;
b3AlignedObjectArray<btSortData> srcHost;
b3AlignedObjectArray<unsigned int> upperHost;
b3AlignedObjectArray<unsigned int> lowerHost;
b3AlignedObjectArray<unsigned int> upperHostCompare;
b3AlignedObjectArray<unsigned int> lowerHostCompare;
btBoundSearchCL* search = new btBoundSearchCL(g_context,g_device,g_queue, maxSize);
@@ -260,8 +260,8 @@ void prefixScanTest()
int maxSize = 1024*256;
btAlignedObjectArray<unsigned int> buf0Host;
btAlignedObjectArray<unsigned int> buf1Host;
b3AlignedObjectArray<unsigned int> buf0Host;
b3AlignedObjectArray<unsigned int> buf1Host;
btOpenCLArray<unsigned int> buf2CL(g_context,g_queue,maxSize);
btOpenCLArray<unsigned int> buf3CL(g_context,g_queue,maxSize);
@@ -305,9 +305,9 @@ bool radixSortTest()
int maxSize = 1024*256;
btAlignedObjectArray<btSortData> buf0Host;
b3AlignedObjectArray<btSortData> buf0Host;
buf0Host.resize(maxSize);
btAlignedObjectArray<btSortData> buf1Host;
b3AlignedObjectArray<btSortData> buf1Host;
buf1Host.resize(maxSize );
btOpenCLArray<btSortData> buf2CL(g_context,g_queue,maxSize);
@@ -356,7 +356,7 @@ int main(int argc, char** argv)
int preferredDeviceIndex = -1;
int preferredPlatformIndex = -1;
CommandLineArgs args(argc, argv);
b3CommandLineArgs args(argc, argv);
args.GetCmdLineArgument("deviceId", preferredDeviceIndex);
args.GetCmdLineArgument("platformId", preferredPlatformIndex);

6
opencl/parallel_primitives/test/premake4.lua
View File

@@ -27,9 +27,9 @@ function createProject(vendor)
"../host/btPrefixScanCL.h",
"../host/btRadixSort32CL.cpp",
"../host/btRadixSort32CL.h",
"../../../src/BulletCommon/btAlignedAllocator.cpp",
"../../../src/BulletCommon/btAlignedAllocator.h",
"../../../src/BulletCommon/btAlignedObjectArray.h",
"../../../src/BulletCommon/b3AlignedAllocator.cpp",
"../../../src/BulletCommon/b3AlignedAllocator.h",
"../../../src/BulletCommon/b3AlignedObjectArray.h",
}
end