Skip to content

Commit 8bb0389

Browse files
committed
[genvectorx] Offload testLorentzVector to device
1 parent f3ccba8 commit 8bb0389

File tree

2 files changed

+68
-21
lines changed

2 files changed

+68
-21
lines changed

math/experimental/genvectorx/test/testGenVectorSYCL.cxx

Lines changed: 67 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -105,12 +105,16 @@ int testVector3D()
105105
{
106106
int iret_host = 0;
107107

108-
std::cout << "testing Vector3D \t:\t";
108+
std::cout << "testing Vector3D \t:\n";
109109

110110
sycl::buffer<int, 1> iret_buf(&iret_host, sycl::range<1>(1));
111111
sycl::default_selector device_selector;
112112
sycl::queue queue(device_selector);
113113

114+
std::cout << "sycl::queue check - selected device:\n"
115+
<< queue.get_device().get_info<sycl::info::device::name>()
116+
<< std::endl;
117+
114118
{
115119
queue.submit([&](sycl::handler &cgh) {
116120
auto iret = iret_buf.get_access<sycl::access::mode::read_write>(cgh);
@@ -167,12 +171,16 @@ int testPoint3D()
167171

168172
int iret_host = 0;
169173

170-
std::cout << "testing Point3D \t:\t";
174+
std::cout << "testing Point3D \t:\n";
171175

172176
sycl::buffer<int, 1> iret_buf(&iret_host, sycl::range<1>(1));
173177
sycl::default_selector device_selector;
174178
sycl::queue queue(device_selector);
175179

180+
std::cout << "sycl::queue check - selected device:\n"
181+
<< queue.get_device().get_info<sycl::info::device::name>()
182+
<< std::endl;
183+
176184
{
177185
queue.submit([&](sycl::handler &cgh) {
178186
auto iret = iret_buf.get_access<sycl::access::mode::read_write>(cgh);
@@ -240,12 +248,16 @@ int testVector2D()
240248

241249
int iret_host = 0;
242250

243-
std::cout << "testing Vector2D \t:\t";
251+
std::cout << "testing Vector2D \t:\n";
244252

245253
sycl::buffer<int, 1> iret_buf(&iret_host, sycl::range<1>(1));
246254
sycl::default_selector device_selector;
247255
sycl::queue queue(device_selector);
248256

257+
std::cout << "sycl::queue check - selected device:\n"
258+
<< queue.get_device().get_info<sycl::info::device::name>()
259+
<< std::endl;
260+
249261
{
250262
queue.submit([&](sycl::handler &cgh) {
251263
auto iret = iret_buf.get_access<sycl::access::mode::read_write>(cgh);
@@ -316,11 +328,15 @@ int testPoint2D()
316328

317329
int iret_host = 0;
318330

319-
std::cout << "testing Point2D \t:\t";
331+
std::cout << "testing Point2D \t:\n";
320332

321333
sycl::buffer<int, 1> iret_buf(&iret_host, sycl::range<1>(1));
322334
sycl::queue queue{sycl::default_selector_v};
323335

336+
std::cout << "sycl::queue check - selected device:\n"
337+
<< queue.get_device().get_info<sycl::info::device::name>()
338+
<< std::endl;
339+
324340
{
325341
queue.submit([&](sycl::handler &cgh) {
326342
auto iret = iret_buf.get_access<sycl::access::mode::read_write>(cgh);
@@ -391,12 +407,16 @@ int testRotations3D()
391407
{
392408

393409
int iret_host = 0;
394-
std::cout << "testing 3D Rotations\t:\t";
410+
std::cout << "testing 3D Rotations\t:\n";
395411

396412
sycl::buffer<int, 1> iret_buf(&iret_host, sycl::range<1>(1));
397413
sycl::default_selector device_selector;
398414
sycl::queue queue(device_selector);
399415

416+
std::cout << "sycl::queue check - selected device:\n"
417+
<< queue.get_device().get_info<sycl::info::device::name>()
418+
<< std::endl;
419+
400420
{
401421
queue.submit([&](sycl::handler &cgh) {
402422
auto iret = iret_buf.get_access<sycl::access::mode::read_write>(cgh);
@@ -529,12 +549,16 @@ int testTransform3D()
529549
{
530550

531551
int iret_host = 0;
532-
std::cout << "testing 3D Transform\t:\t";
552+
std::cout << "testing 3D Transform\t:\n";
533553

534554
sycl::buffer<int, 1> iret_buf(&iret_host, sycl::range<1>(1));
535555
sycl::default_selector device_selector;
536556
sycl::queue queue(device_selector);
537557

558+
std::cout << "sycl::queue check - selected device:\n"
559+
<< queue.get_device().get_info<sycl::info::device::name>()
560+
<< std::endl;
561+
538562
{
539563
queue.submit([&](sycl::handler &cgh) {
540564
auto iret = iret_buf.get_access<sycl::access::mode::read_write>(cgh);
@@ -757,12 +781,16 @@ int testTransform3D()
757781
int testVectorUtil()
758782
{
759783
int iret_host = 0;
760-
std::cout << "testing VectorUtil \t:\t";
784+
std::cout << "testing VectorUtil \t:\n";
761785

762786
sycl::buffer<int, 1> iret_buf(&iret_host, sycl::range<1>(1));
763787
sycl::default_selector device_selector;
764788
sycl::queue queue(device_selector);
765789

790+
std::cout << "sycl::queue check - selected device:\n"
791+
<< queue.get_device().get_info<sycl::info::device::name>()
792+
<< std::endl;
793+
766794
{
767795
queue.submit([&](sycl::handler &cgh) {
768796
auto iret = iret_buf.get_access<sycl::access::mode::read_write>(cgh);
@@ -834,20 +862,39 @@ int testVectorUtil()
834862

835863
int testLorentzVector()
836864
{
837-
std::cout << "testing LorentzVector \t:\t";
838-
int iret = 0;
839-
LorentzVector<PtEtaPhiM4D<float>> v1(1, 2, 3, 4);
840-
LorentzVector<PtEtaPhiM4D<float>> v2(5, 6, 7, 8);
841-
iret |= compare(v1.DeltaR(v2), 4.60575f);
842-
// Result cross-validated using:
843-
// TLorentzVector t1, t2;
844-
// t1.SetPtEtaPhiE(1,2,3,4); t2.SetPtEtaPhiE(5,6,7,8);
845-
// t1.DeltaR(t2)
846-
if (iret == 0)
847-
std::cout << "\t\t\tOK\n";
865+
int iret_host = 0;
866+
std::cout << "testing LorentzVector \t:\n";
867+
868+
sycl::buffer<int, 1> iret_buf(&iret_host, sycl::range<1>(1));
869+
sycl::default_selector device_selector;
870+
sycl::queue queue(device_selector);
871+
872+
std::cout << "sycl::queue check - selected device:\n"
873+
<< queue.get_device().get_info<sycl::info::device::name>()
874+
<< std::endl;
875+
876+
{
877+
queue.submit([&](sycl::handler &cgh) {
878+
auto iret = iret_buf.get_access<sycl::access::mode::read_write>(cgh);
879+
cgh.single_task<class testRotations3D>([=]() {
880+
LorentzVector<PtEtaPhiM4D<float>> v1(1, 2, 3, 4);
881+
LorentzVector<PtEtaPhiM4D<float>> v2(5, 6, 7, 8);
882+
iret[0] |= compare(v1.DeltaR(v2), 4.60575f);
883+
884+
LorentzVector<PtEtaPhiM4D<float>> v = v1+v2;
885+
iret[0] |= compare(v.M(), 62.03058f);
886+
887+
});
888+
});
889+
}
890+
891+
if (iret_host == 0)
892+
std::cout << "\tOK\n";
848893
else
849-
std::cout << "\t\t\t\t\t\tFAILED\n";
850-
return iret;
894+
std::cout << "\t FAILED\n";
895+
896+
return iret_host;
897+
851898
}
852899

853900
int testGenVector()

math/genvector/test/testGenVector.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -816,7 +816,7 @@ int testLorentzVector()
816816
// TLorentzVector t1, t2;
817817
// t1.SetPtEtaPhiM(1,2,3,4); t2.SetPtEtaPhiM(5,6,7,8);
818818
// t1.DeltaR(t2)
819-
819+
820820
// test structured bindings
821821
auto const [x, y, z, E] = v1;
822822
iret |= (x != v1.X());

0 commit comments

Comments
 (0)