Skip to content

Commit 6bf725a

Browse files
rhornung67rhornung67
authored
Merge pull request #97 from LLNL/v0.10.0-rc
V0.10.0 rc
2 parents 064dd17 + e18c828 commit 6bf725a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+1250
-324
lines changed

‎CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ if (ENABLE_OPENMP)
7070
endif ()
7171

7272
set(RAJA_PERFSUITE_VERSION_MAJOR 0)
73-
set(RAJA_PERFSUITE_VERSION_MINOR 9)
73+
set(RAJA_PERFSUITE_VERSION_MINOR 10)
7474
set(RAJA_PERFSUITE_VERSION_PATCHLEVEL 0)
7575

7676
set(RAJA_PERFSUITE_DEPENDS RAJA)

‎README.md

+212-178
Large diffs are not rendered by default.

‎src/apps/DEL_DOT_VEC_2D.cpp

+17
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,23 @@ DEL_DOT_VEC_2D::DEL_DOT_VEC_2D(const RunParams& params)
2828
m_domain = new ADomain(getRunSize(), /* ndims = */ 2);
2929

3030
m_array_length = m_domain->nnalls;
31+
32+
setVariantDefined( Base_Seq );
33+
setVariantDefined( Lambda_Seq );
34+
setVariantDefined( RAJA_Seq );
35+
36+
setVariantDefined( Base_OpenMP );
37+
setVariantDefined( Lambda_OpenMP );
38+
setVariantDefined( RAJA_OpenMP );
39+
40+
setVariantDefined( Base_OpenMPTarget );
41+
setVariantDefined( RAJA_OpenMPTarget );
42+
43+
setVariantDefined( Base_CUDA );
44+
setVariantDefined( RAJA_CUDA );
45+
46+
setVariantDefined( Base_HIP );
47+
setVariantDefined( RAJA_HIP );
3148
}
3249

3350
DEL_DOT_VEC_2D::~DEL_DOT_VEC_2D()

‎src/apps/ENERGY.cpp

+17
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,23 @@ ENERGY::ENERGY(const RunParams& params)
2323
{
2424
setDefaultSize(100000);
2525
setDefaultReps(1300);
26+
27+
setVariantDefined( Base_Seq );
28+
setVariantDefined( Lambda_Seq );
29+
setVariantDefined( RAJA_Seq );
30+
31+
setVariantDefined( Base_OpenMP );
32+
setVariantDefined( Lambda_OpenMP );
33+
setVariantDefined( RAJA_OpenMP );
34+
35+
setVariantDefined( Base_OpenMPTarget );
36+
setVariantDefined( RAJA_OpenMPTarget );
37+
38+
setVariantDefined( Base_CUDA );
39+
setVariantDefined( RAJA_CUDA );
40+
41+
setVariantDefined( Base_HIP );
42+
setVariantDefined( RAJA_HIP );
2643
}
2744

2845
ENERGY::~ENERGY()

‎src/apps/FIR.cpp

+17
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,23 @@ FIR::FIR(const RunParams& params)
2525
setDefaultReps(1600);
2626

2727
m_coefflen = FIR_COEFFLEN;
28+
29+
setVariantDefined( Base_Seq );
30+
setVariantDefined( Lambda_Seq );
31+
setVariantDefined( RAJA_Seq );
32+
33+
setVariantDefined( Base_OpenMP );
34+
setVariantDefined( Lambda_OpenMP );
35+
setVariantDefined( RAJA_OpenMP );
36+
37+
setVariantDefined( Base_OpenMPTarget );
38+
setVariantDefined( RAJA_OpenMPTarget );
39+
40+
setVariantDefined( Base_CUDA );
41+
setVariantDefined( RAJA_CUDA );
42+
43+
setVariantDefined( Base_HIP );
44+
setVariantDefined( RAJA_HIP );
2845
}
2946

3047
FIR::~FIR()

‎src/apps/LTIMES.cpp

+17
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,23 @@ LTIMES::LTIMES(const RunParams& params)
2929
setDefaultSize(m_num_d_default * m_num_m_default *
3030
m_num_g_default * m_num_z_default);
3131
setDefaultReps(50);
32+
33+
setVariantDefined( Base_Seq );
34+
setVariantDefined( Lambda_Seq );
35+
setVariantDefined( RAJA_Seq );
36+
37+
setVariantDefined( Base_OpenMP );
38+
setVariantDefined( Lambda_OpenMP );
39+
setVariantDefined( RAJA_OpenMP );
40+
41+
setVariantDefined( Base_OpenMPTarget );
42+
setVariantDefined( RAJA_OpenMPTarget );
43+
44+
setVariantDefined( Base_CUDA );
45+
setVariantDefined( RAJA_CUDA );
46+
47+
setVariantDefined( Base_HIP );
48+
setVariantDefined( RAJA_HIP );
3249
}
3350

3451
LTIMES::~LTIMES()

‎src/apps/LTIMES_NOVIEW.cpp

+17
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,23 @@ LTIMES_NOVIEW::LTIMES_NOVIEW(const RunParams& params)
2929
setDefaultSize(m_num_d_default * m_num_m_default *
3030
m_num_g_default * m_num_z_default);
3131
setDefaultReps(50);
32+
33+
setVariantDefined( Base_Seq );
34+
setVariantDefined( Lambda_Seq );
35+
setVariantDefined( RAJA_Seq );
36+
37+
setVariantDefined( Base_OpenMP );
38+
setVariantDefined( Lambda_OpenMP );
39+
setVariantDefined( RAJA_OpenMP );
40+
41+
setVariantDefined( Base_OpenMPTarget );
42+
setVariantDefined( RAJA_OpenMPTarget );
43+
44+
setVariantDefined( Base_CUDA );
45+
setVariantDefined( RAJA_CUDA );
46+
47+
setVariantDefined( Base_HIP );
48+
setVariantDefined( RAJA_HIP );
3249
}
3350

3451
LTIMES_NOVIEW::~LTIMES_NOVIEW()

‎src/apps/PRESSURE.cpp

+17
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,23 @@ PRESSURE::PRESSURE(const RunParams& params)
2323
{
2424
setDefaultSize(100000);
2525
setDefaultReps(7000);
26+
27+
setVariantDefined( Base_Seq );
28+
setVariantDefined( Lambda_Seq );
29+
setVariantDefined( RAJA_Seq );
30+
31+
setVariantDefined( Base_OpenMP );
32+
setVariantDefined( Lambda_OpenMP );
33+
setVariantDefined( RAJA_OpenMP );
34+
35+
setVariantDefined( Base_OpenMPTarget );
36+
setVariantDefined( RAJA_OpenMPTarget );
37+
38+
setVariantDefined( Base_CUDA );
39+
setVariantDefined( RAJA_CUDA );
40+
41+
setVariantDefined( Base_HIP );
42+
setVariantDefined( RAJA_HIP );
2643
}
2744

2845
PRESSURE::~PRESSURE()

‎src/apps/VOL3D.cpp

+18-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,24 @@ VOL3D::VOL3D(const RunParams& params)
2727

2828
m_domain = new ADomain(getRunSize(), /* ndims = */ 3);
2929

30-
m_array_length = m_domain->nnalls;;
30+
m_array_length = m_domain->nnalls;
31+
32+
setVariantDefined( Base_Seq );
33+
setVariantDefined( Lambda_Seq );
34+
setVariantDefined( RAJA_Seq );
35+
36+
setVariantDefined( Base_OpenMP );
37+
setVariantDefined( Lambda_OpenMP );
38+
setVariantDefined( RAJA_OpenMP );
39+
40+
setVariantDefined( Base_OpenMPTarget );
41+
setVariantDefined( RAJA_OpenMPTarget );
42+
43+
setVariantDefined( Base_CUDA );
44+
setVariantDefined( RAJA_CUDA );
45+
46+
setVariantDefined( Base_HIP );
47+
setVariantDefined( RAJA_HIP );
3148
}
3249

3350
VOL3D::~VOL3D()

‎src/basic/ATOMIC_PI.cpp

+19-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,25 @@ namespace basic
2121
ATOMIC_PI::ATOMIC_PI(const RunParams& params)
2222
: KernelBase(rajaperf::Basic_ATOMIC_PI, params)
2323
{
24-
setDefaultSize(3000);
25-
setDefaultReps(10000);
24+
setDefaultSize(3000);
25+
setDefaultReps(10000);
26+
27+
setVariantDefined( Base_Seq );
28+
setVariantDefined( Lambda_Seq );
29+
setVariantDefined( RAJA_Seq );
30+
31+
setVariantDefined( Base_OpenMP );
32+
setVariantDefined( Lambda_OpenMP );
33+
setVariantDefined( RAJA_OpenMP );
34+
35+
setVariantDefined( Base_OpenMPTarget );
36+
setVariantDefined( RAJA_OpenMPTarget );
37+
38+
setVariantDefined( Base_CUDA );
39+
setVariantDefined( RAJA_CUDA );
40+
41+
setVariantDefined( Base_HIP );
42+
setVariantDefined( RAJA_HIP );
2643
}
2744

2845
ATOMIC_PI::~ATOMIC_PI()

‎src/basic/DAXPY.cpp

+19-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,25 @@ namespace basic
2121
DAXPY::DAXPY(const RunParams& params)
2222
: KernelBase(rajaperf::Basic_DAXPY, params)
2323
{
24-
setDefaultSize(100000);
25-
setDefaultReps(5000);
24+
setDefaultSize(100000);
25+
setDefaultReps(5000);
26+
27+
setVariantDefined( Base_Seq );
28+
setVariantDefined( Lambda_Seq );
29+
setVariantDefined( RAJA_Seq );
30+
31+
setVariantDefined( Base_OpenMP );
32+
setVariantDefined( Lambda_OpenMP );
33+
setVariantDefined( RAJA_OpenMP );
34+
35+
setVariantDefined( Base_OpenMPTarget );
36+
setVariantDefined( RAJA_OpenMPTarget );
37+
38+
setVariantDefined( Base_CUDA );
39+
setVariantDefined( RAJA_CUDA );
40+
41+
setVariantDefined( Base_HIP );
42+
setVariantDefined( RAJA_HIP );
2643
}
2744

2845
DAXPY::~DAXPY()

‎src/basic/IF_QUAD.cpp

+19-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,25 @@ namespace basic
2121
IF_QUAD::IF_QUAD(const RunParams& params)
2222
: KernelBase(rajaperf::Basic_IF_QUAD, params)
2323
{
24-
setDefaultSize(100000);
25-
setDefaultReps(1800);
24+
setDefaultSize(100000);
25+
setDefaultReps(1800);
26+
27+
setVariantDefined( Base_Seq );
28+
setVariantDefined( Lambda_Seq );
29+
setVariantDefined( RAJA_Seq );
30+
31+
setVariantDefined( Base_OpenMP );
32+
setVariantDefined( Lambda_OpenMP );
33+
setVariantDefined( RAJA_OpenMP );
34+
35+
setVariantDefined( Base_OpenMPTarget );
36+
setVariantDefined( RAJA_OpenMPTarget );
37+
38+
setVariantDefined( Base_CUDA );
39+
setVariantDefined( RAJA_CUDA );
40+
41+
setVariantDefined( Base_HIP );
42+
setVariantDefined( RAJA_HIP );
2643
}
2744

2845
IF_QUAD::~IF_QUAD()

‎src/basic/INIT3.cpp

+19-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,25 @@ namespace basic
2121
INIT3::INIT3(const RunParams& params)
2222
: KernelBase(rajaperf::Basic_INIT3, params)
2323
{
24-
setDefaultSize(100000);
25-
setDefaultReps(5000);
24+
setDefaultSize(100000);
25+
setDefaultReps(5000);
26+
27+
setVariantDefined( Base_Seq );
28+
setVariantDefined( Lambda_Seq );
29+
setVariantDefined( RAJA_Seq );
30+
31+
setVariantDefined( Base_OpenMP );
32+
setVariantDefined( Lambda_OpenMP );
33+
setVariantDefined( RAJA_OpenMP );
34+
35+
setVariantDefined( Base_OpenMPTarget );
36+
setVariantDefined( RAJA_OpenMPTarget );
37+
38+
setVariantDefined( Base_CUDA );
39+
setVariantDefined( RAJA_CUDA );
40+
41+
setVariantDefined( Base_HIP );
42+
setVariantDefined( RAJA_HIP );
2643
}
2744

2845
INIT3::~INIT3()

‎src/basic/INIT_VIEW1D.cpp

+19-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,25 @@ namespace basic
2121
INIT_VIEW1D::INIT_VIEW1D(const RunParams& params)
2222
: KernelBase(rajaperf::Basic_INIT_VIEW1D, params)
2323
{
24-
setDefaultSize(500000);
25-
setDefaultReps(5000);
24+
setDefaultSize(500000);
25+
setDefaultReps(5000);
26+
27+
setVariantDefined( Base_Seq );
28+
setVariantDefined( Lambda_Seq );
29+
setVariantDefined( RAJA_Seq );
30+
31+
setVariantDefined( Base_OpenMP );
32+
setVariantDefined( Lambda_OpenMP );
33+
setVariantDefined( RAJA_OpenMP );
34+
35+
setVariantDefined( Base_OpenMPTarget );
36+
setVariantDefined( RAJA_OpenMPTarget );
37+
38+
setVariantDefined( Base_CUDA );
39+
setVariantDefined( RAJA_CUDA );
40+
41+
setVariantDefined( Base_HIP );
42+
setVariantDefined( RAJA_HIP );
2643
}
2744

2845
INIT_VIEW1D::~INIT_VIEW1D()

‎src/basic/INIT_VIEW1D_OFFSET.cpp

+19-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,25 @@ namespace basic
2121
INIT_VIEW1D_OFFSET::INIT_VIEW1D_OFFSET(const RunParams& params)
2222
: KernelBase(rajaperf::Basic_INIT_VIEW1D_OFFSET, params)
2323
{
24-
setDefaultSize(500000);
25-
setDefaultReps(5000);
24+
setDefaultSize(500000);
25+
setDefaultReps(5000);
26+
27+
setVariantDefined( Base_Seq );
28+
setVariantDefined( Lambda_Seq );
29+
setVariantDefined( RAJA_Seq );
30+
31+
setVariantDefined( Base_OpenMP );
32+
setVariantDefined( Lambda_OpenMP );
33+
setVariantDefined( RAJA_OpenMP );
34+
35+
setVariantDefined( Base_OpenMPTarget );
36+
setVariantDefined( RAJA_OpenMPTarget );
37+
38+
setVariantDefined( Base_CUDA );
39+
setVariantDefined( RAJA_CUDA );
40+
41+
setVariantDefined( Base_HIP );
42+
setVariantDefined( RAJA_HIP );
2643
}
2744

2845
INIT_VIEW1D_OFFSET::~INIT_VIEW1D_OFFSET()

‎src/basic/MULADDSUB.cpp

+19-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,25 @@ namespace basic
2121
MULADDSUB::MULADDSUB(const RunParams& params)
2222
: KernelBase(rajaperf::Basic_MULADDSUB, params)
2323
{
24-
setDefaultSize(100000);
25-
setDefaultReps(3500);
24+
setDefaultSize(100000);
25+
setDefaultReps(3500);
26+
27+
setVariantDefined( Base_Seq );
28+
setVariantDefined( Lambda_Seq );
29+
setVariantDefined( RAJA_Seq );
30+
31+
setVariantDefined( Base_OpenMP );
32+
setVariantDefined( Lambda_OpenMP );
33+
setVariantDefined( RAJA_OpenMP );
34+
35+
setVariantDefined( Base_OpenMPTarget );
36+
setVariantDefined( RAJA_OpenMPTarget );
37+
38+
setVariantDefined( Base_CUDA );
39+
setVariantDefined( RAJA_CUDA );
40+
41+
setVariantDefined( Base_HIP );
42+
setVariantDefined( RAJA_HIP );
2643
}
2744

2845
MULADDSUB::~MULADDSUB()

‎src/basic/NESTED_INIT.cpp

+17
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,23 @@ NESTED_INIT::NESTED_INIT(const RunParams& params)
3030

3131
setDefaultSize(m_ni * m_nj * m_nk);
3232
setDefaultReps(100);
33+
34+
setVariantDefined( Base_Seq );
35+
setVariantDefined( Lambda_Seq );
36+
setVariantDefined( RAJA_Seq );
37+
38+
setVariantDefined( Base_OpenMP );
39+
setVariantDefined( Lambda_OpenMP );
40+
setVariantDefined( RAJA_OpenMP );
41+
42+
setVariantDefined( Base_OpenMPTarget );
43+
setVariantDefined( RAJA_OpenMPTarget );
44+
45+
setVariantDefined( Base_CUDA );
46+
setVariantDefined( RAJA_CUDA );
47+
48+
setVariantDefined( Base_HIP );
49+
setVariantDefined( RAJA_HIP );
3350
}
3451

3552
NESTED_INIT::~NESTED_INIT()

0 commit comments

Comments
 (0)