diff --git a/FastCaloSimAnalyzer/FastCaloGpu/FastCaloGpu/TestStdPar.h b/FastCaloSimAnalyzer/FastCaloGpu/FastCaloGpu/TestStdPar.h index 426cbda..1b15cbd 100644 --- a/FastCaloSimAnalyzer/FastCaloGpu/FastCaloGpu/TestStdPar.h +++ b/FastCaloSimAnalyzer/FastCaloGpu/FastCaloGpu/TestStdPar.h @@ -7,7 +7,9 @@ class TestStdPar { void testAll(unsigned long); - void test_vector(unsigned long); + void test_floatArray(unsigned long); + void test_vecInt(unsigned long); + void test_vecFloat(unsigned long); void test_atomicAdd_int(unsigned long); void test_atomicAdd_float(unsigned long); diff --git a/FastCaloSimAnalyzer/FastCaloGpu/src/TestStdPar.cxx b/FastCaloSimAnalyzer/FastCaloGpu/src/TestStdPar.cxx index 1b4b486..fa0876f 100644 --- a/FastCaloSimAnalyzer/FastCaloGpu/src/TestStdPar.cxx +++ b/FastCaloSimAnalyzer/FastCaloGpu/src/TestStdPar.cxx @@ -8,15 +8,56 @@ #include void TestStdPar::testAll(unsigned long num) { - test_vector(num); + test_vecInt(num); + test_vecFloat(num); test_atomicAdd_int(num); test_atomicAdd_float(num); } -void TestStdPar::test_vector(unsigned long num) { +void TestStdPar::test_floatArray(unsigned long num) { - std::cout << "---------- test_vec( " << num << " ) -------------\n"; + std::cout << "---------- test_floatArray( " << num << " ) -------------\n"; + double sum(0.); + float *pf = new float[num]; + for (int i=0; i( " << num << " ) -------------\n"; + + double sum(0.); std::vector* pvec = new std::vector; pvec->resize(num); @@ -25,20 +66,74 @@ void TestStdPar::test_vector(unsigned long num) { for (int i=0; i( " << num << " ) -------------\n"; + + long int sum(0); + std::vector* pvec = new std::vector; + pvec->resize(num); + + int* pdat = pvec->data(); + + for (int i=0; i(num) -------------\n"; + + } + + void TestStdPar::test_atomicAdd_int(unsigned long num) { std::cout << "---------- test_atomic_add -------------\n"; diff --git a/FastCaloSimAnalyzer/Root/TFCSStdParTest.cxx b/FastCaloSimAnalyzer/Root/TFCSStdParTest.cxx index 9de6d26..15b0127 100644 --- a/FastCaloSimAnalyzer/Root/TFCSStdParTest.cxx +++ b/FastCaloSimAnalyzer/Root/TFCSStdParTest.cxx @@ -12,6 +12,10 @@ void TFCSStdParTest::test(bool doAtomic, bool doVector, unsigned long num) { tst.test_atomicAdd_float(num); } - if (doVector) tst.test_vector(num); + if (doVector) { + tst.test_floatArray(num); + tst.test_vecFloat(num); + tst.test_vecInt(num); + } }