Skip to content

Commit c73dbad

Browse files
rhornung67rhornung67
committed
Propagate changes to squash all compiler warning associated with repo loops
1 parent fe13de3 commit c73dbad

File tree

481 files changed

+2392
-1197
lines changed

Some content is hidden

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

481 files changed

+2392
-1197
lines changed

‎src/algorithm/ATOMIC-Cuda.cpp‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,8 @@ void ATOMIC::runCudaVariantReplicateGlobal(VariantID vid)
9292
if ( vid == Base_CUDA ) {
9393

9494
startTimer();
95-
for (RepIndex_type irep = 0; irep < run_reps; irep = irep + 1) {
95+
// Awkward expression for loop counter quiets C++20 compiler warning
96+
for (RepIndex_type irep = 0; irep < run_reps; ((irep = irep + 1), 0)) {
9697

9798
const size_t grid_size = RAJA_DIVIDE_CEILING_INT(iend, block_size);
9899
constexpr size_t shmem = 0;
@@ -109,7 +110,8 @@ void ATOMIC::runCudaVariantReplicateGlobal(VariantID vid)
109110
} else if ( vid == RAJA_CUDA ) {
110111

111112
startTimer();
112-
for (RepIndex_type irep = 0; irep < run_reps; irep = irep + 1) {
113+
// Awkward expression for loop counter quiets C++20 compiler warning
114+
for (RepIndex_type irep = 0; irep < run_reps; ((irep = irep + 1), 0)) {
113115

114116
RAJA::forall<RAJA::cuda_exec<block_size, true /*async*/>>( res,
115117
RAJA::RangeSegment(ibegin, iend), [=] __device__ (Index_type i) {
@@ -139,7 +141,8 @@ void ATOMIC::runCudaVariantReplicateWarp(VariantID vid)
139141
if ( vid == Base_CUDA ) {
140142

141143
startTimer();
142-
for (RepIndex_type irep = 0; irep < run_reps; irep = irep + 1) {
144+
// Awkward expression for loop counter quiets C++20 compiler warning
145+
for (RepIndex_type irep = 0; irep < run_reps; ((irep = irep + 1), 0)) {
143146

144147
const size_t grid_size = RAJA_DIVIDE_CEILING_INT(iend, block_size);
145148
constexpr size_t shmem = 0;
@@ -173,7 +176,8 @@ void ATOMIC::runCudaVariantReplicateBlock(VariantID vid)
173176
if ( vid == Base_CUDA ) {
174177

175178
startTimer();
176-
for (RepIndex_type irep = 0; irep < run_reps; irep = irep + 1) {
179+
// Awkward expression for loop counter quiets C++20 compiler warning
180+
for (RepIndex_type irep = 0; irep < run_reps; ((irep = irep + 1), 0)) {
177181

178182
const size_t grid_size = RAJA_DIVIDE_CEILING_INT(iend, block_size);
179183
constexpr size_t shmem = 0;

‎src/algorithm/ATOMIC-Hip.cpp‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,8 @@ void ATOMIC::runHipVariantReplicateGlobal(VariantID vid)
9292
if ( vid == Base_HIP ) {
9393

9494
startTimer();
95-
for (RepIndex_type irep = 0; irep < run_reps; irep = irep + 1) {
95+
// Awkward expression for loop counter quiets C++20 compiler warning
96+
for (RepIndex_type irep = 0; irep < run_reps; ((irep = irep + 1), 0)) {
9697

9798
const size_t grid_size = RAJA_DIVIDE_CEILING_INT(iend, block_size);
9899
constexpr size_t shmem = 0;
@@ -109,7 +110,8 @@ void ATOMIC::runHipVariantReplicateGlobal(VariantID vid)
109110
} else if ( vid == RAJA_HIP ) {
110111

111112
startTimer();
112-
for (RepIndex_type irep = 0; irep < run_reps; irep = irep + 1) {
113+
// Awkward expression for loop counter quiets C++20 compiler warning
114+
for (RepIndex_type irep = 0; irep < run_reps; ((irep = irep + 1), 0)) {
113115

114116
RAJA::forall<RAJA::hip_exec<block_size, true /*async*/>>( res,
115117
RAJA::RangeSegment(ibegin, iend), [=] __device__ (Index_type i) {
@@ -139,7 +141,8 @@ void ATOMIC::runHipVariantReplicateWarp(VariantID vid)
139141
if ( vid == Base_HIP ) {
140142

141143
startTimer();
142-
for (RepIndex_type irep = 0; irep < run_reps; irep = irep + 1) {
144+
// Awkward expression for loop counter quiets C++20 compiler warning
145+
for (RepIndex_type irep = 0; irep < run_reps; ((irep = irep + 1), 0)) {
143146

144147
const size_t grid_size = RAJA_DIVIDE_CEILING_INT(iend, block_size);
145148
constexpr size_t shmem = 0;
@@ -173,7 +176,8 @@ void ATOMIC::runHipVariantReplicateBlock(VariantID vid)
173176
if ( vid == Base_HIP ) {
174177

175178
startTimer();
176-
for (RepIndex_type irep = 0; irep < run_reps; irep = irep + 1) {
179+
// Awkward expression for loop counter quiets C++20 compiler warning
180+
for (RepIndex_type irep = 0; irep < run_reps; ((irep = irep + 1), 0)) {
177181

178182
const size_t grid_size = RAJA_DIVIDE_CEILING_INT(iend, block_size);
179183
constexpr size_t shmem = 0;

‎src/algorithm/ATOMIC-OMP.cpp‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ void ATOMIC::runOpenMPVariantReplicate(VariantID vid)
3434
case Base_OpenMP : {
3535

3636
startTimer();
37-
for (RepIndex_type irep = 0; irep < run_reps; irep = irep + 1) {
37+
// Awkward expression for loop counter quiets C++20 compiler warning
38+
for (RepIndex_type irep = 0; irep < run_reps; static_cast<void>(((irep = irep + 1), 0))) {
3839

3940
#pragma omp parallel for
4041
for (Index_type i = ibegin; i < iend; ++i ) {
@@ -54,7 +55,8 @@ void ATOMIC::runOpenMPVariantReplicate(VariantID vid)
5455
};
5556

5657
startTimer();
57-
for (RepIndex_type irep = 0; irep < run_reps; irep = irep + 1) {
58+
// Awkward expression for loop counter quiets C++20 compiler warning
59+
for (RepIndex_type irep = 0; irep < run_reps; static_cast<void>(((irep = irep + 1), 0))) {
5860

5961
#pragma omp parallel for
6062
for (Index_type i = ibegin; i < iend; ++i ) {
@@ -72,7 +74,8 @@ void ATOMIC::runOpenMPVariantReplicate(VariantID vid)
7274
auto res{getHostResource()};
7375

7476
startTimer();
75-
for (RepIndex_type irep = 0; irep < run_reps; irep = irep + 1) {
77+
// Awkward expression for loop counter quiets C++20 compiler warning
78+
for (RepIndex_type irep = 0; irep < run_reps; static_cast<void>(((irep = irep + 1), 0))) {
7679

7780
RAJA::forall<RAJA::omp_parallel_for_exec>( res,
7881
RAJA::RangeSegment(ibegin, iend), [=](Index_type i) {

‎src/algorithm/ATOMIC-OMPTarget.cpp‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ void ATOMIC::runOpenMPTargetVariantReplicate(VariantID vid)
3838
if ( vid == Base_OpenMPTarget ) {
3939

4040
startTimer();
41-
for (RepIndex_type irep = 0; irep < run_reps; irep = irep + 1) {
41+
// Awkward expression for loop counter quiets C++20 compiler warning
42+
for (RepIndex_type irep = 0; irep < run_reps; ((irep = irep + 1), 0)) {
4243

4344
#pragma omp target is_device_ptr(atomic)
4445
#pragma omp teams distribute parallel for thread_limit(threads_per_team) schedule(static, 1)
@@ -54,7 +55,8 @@ void ATOMIC::runOpenMPTargetVariantReplicate(VariantID vid)
5455
auto res{getOmpTargetResource()};
5556

5657
startTimer();
57-
for (RepIndex_type irep = 0; irep < run_reps; irep = irep + 1) {
58+
// Awkward expression for loop counter quiets C++20 compiler warning
59+
for (RepIndex_type irep = 0; irep < run_reps; ((irep = irep + 1), 0)) {
5860

5961
RAJA::forall<RAJA::omp_target_parallel_for_exec<threads_per_team>>( res,
6062
RAJA::RangeSegment(ibegin, iend), [=](Index_type i) {

‎src/algorithm/ATOMIC-Seq.cpp‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ void ATOMIC::runSeqVariantReplicate(VariantID vid)
3232
case Base_Seq : {
3333

3434
startTimer();
35-
for (RepIndex_type irep = 0; irep < run_reps; irep = irep + 1) {
35+
// Awkward expression for loop counter quiets C++20 compiler warning
36+
for (RepIndex_type irep = 0; irep < run_reps; static_cast<void>(((irep = irep + 1), 0))) {
3637

3738
for (Index_type i = ibegin; i < iend; ++i ) {
3839
ATOMIC_BODY(RAJAPERF_ATOMIC_ADD_SEQ, i, ATOMIC_VALUE);
@@ -52,7 +53,8 @@ void ATOMIC::runSeqVariantReplicate(VariantID vid)
5253
};
5354

5455
startTimer();
55-
for (RepIndex_type irep = 0; irep < run_reps; irep = irep + 1) {
56+
// Awkward expression for loop counter quiets C++20 compiler warning
57+
for (RepIndex_type irep = 0; irep < run_reps; static_cast<void>(((irep = irep + 1), 0))) {
5658

5759
for (Index_type i = ibegin; i < iend; ++i ) {
5860
atomic_base_lam(i);
@@ -69,7 +71,8 @@ void ATOMIC::runSeqVariantReplicate(VariantID vid)
6971
auto res{getHostResource()};
7072

7173
startTimer();
72-
for (RepIndex_type irep = 0; irep < run_reps; irep = irep + 1) {
74+
// Awkward expression for loop counter quiets C++20 compiler warning
75+
for (RepIndex_type irep = 0; irep < run_reps; static_cast<void>(((irep = irep + 1), 0))) {
7376

7477
RAJA::forall<RAJA::seq_exec>( res,
7578
RAJA::RangeSegment(ibegin, iend),

‎src/algorithm/HISTOGRAM-Cuda.cpp‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,8 @@ void HISTOGRAM::runCudaVariantLibrary(VariantID vid)
116116
d_temp_storage = temp_storage;
117117

118118
startTimer();
119-
for (RepIndex_type irep = 0; irep < run_reps; irep = irep + 1) {
119+
// Awkward expression for loop counter quiets C++20 compiler warning
120+
for (RepIndex_type irep = 0; irep < run_reps; ((irep = irep + 1), 0)) {
120121

121122
// Run
122123
CAMP_CUDA_API_INVOKE_AND_CHECK(::cub::DeviceHistogram::HistogramEven,
@@ -183,7 +184,8 @@ void HISTOGRAM::runCudaVariantAtomicRuntime(VariantID vid)
183184
RAJAPERF_CUDA_REDUCER_SETUP(Data_ptr, counts, hcounts, num_bins, global_replication);
184185

185186
startTimer();
186-
for (RepIndex_type irep = 0; irep < run_reps; irep = irep + 1) {
187+
// Awkward expression for loop counter quiets C++20 compiler warning
188+
for (RepIndex_type irep = 0; irep < run_reps; ((irep = irep + 1), 0)) {
187189

188190
RAJAPERF_CUDA_REDUCER_INITIALIZE(counts_init, counts, hcounts, num_bins, global_replication);
189191

@@ -233,7 +235,8 @@ void HISTOGRAM::runCudaVariantAtomicRuntime(VariantID vid)
233235
RAJA::GetOffsetLeft<int>>>>;
234236

235237
startTimer();
236-
for (RepIndex_type irep = 0; irep < run_reps; irep = irep + 1) {
238+
// Awkward expression for loop counter quiets C++20 compiler warning
239+
for (RepIndex_type irep = 0; irep < run_reps; ((irep = irep + 1), 0)) {
237240

238241
HISTOGRAM_INIT_COUNTS_RAJA(multi_reduce_policy);
239242

‎src/algorithm/HISTOGRAM-Hip.cpp‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,8 @@ void HISTOGRAM::runHipVariantLibrary(VariantID vid)
133133
d_temp_storage = temp_storage;
134134

135135
startTimer();
136-
for (RepIndex_type irep = 0; irep < run_reps; irep = irep + 1) {
136+
// Awkward expression for loop counter quiets C++20 compiler warning
137+
for (RepIndex_type irep = 0; irep < run_reps; ((irep = irep + 1), 0)) {
137138

138139
// Run
139140
#if defined(__HIPCC__)
@@ -212,7 +213,8 @@ void HISTOGRAM::runHipVariantAtomicRuntime(VariantID vid)
212213
RAJAPERF_HIP_REDUCER_SETUP(Data_ptr, counts, hcounts, num_bins, global_replication);
213214

214215
startTimer();
215-
for (RepIndex_type irep = 0; irep < run_reps; irep = irep + 1) {
216+
// Awkward expression for loop counter quiets C++20 compiler warning
217+
for (RepIndex_type irep = 0; irep < run_reps; ((irep = irep + 1), 0)) {
216218

217219
RAJAPERF_HIP_REDUCER_INITIALIZE(counts_init, counts, hcounts, num_bins, global_replication);
218220

@@ -262,7 +264,8 @@ void HISTOGRAM::runHipVariantAtomicRuntime(VariantID vid)
262264
RAJA::GetOffsetLeft<int>>>>;
263265

264266
startTimer();
265-
for (RepIndex_type irep = 0; irep < run_reps; irep = irep + 1) {
267+
// Awkward expression for loop counter quiets C++20 compiler warning
268+
for (RepIndex_type irep = 0; irep < run_reps; ((irep = irep + 1), 0)) {
266269

267270
HISTOGRAM_INIT_COUNTS_RAJA(multi_reduce_policy);
268271

‎src/algorithm/HISTOGRAM-OMP.cpp‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ void HISTOGRAM::runOpenMPVariant(VariantID vid, size_t RAJAPERF_UNUSED_ARG(tune_
3535
HISTOGRAM_SETUP_COUNTS;
3636

3737
startTimer();
38-
for (RepIndex_type irep = 0; irep < run_reps; irep = irep + 1) {
38+
// Awkward expression for loop counter quiets C++20 compiler warning
39+
for (RepIndex_type irep = 0; irep < run_reps; ((irep = irep + 1), 0)) {
3940

4041
HISTOGRAM_INIT_COUNTS;
4142

@@ -63,7 +64,8 @@ void HISTOGRAM::runOpenMPVariant(VariantID vid, size_t RAJAPERF_UNUSED_ARG(tune_
6364
};
6465

6566
startTimer();
66-
for (RepIndex_type irep = 0; irep < run_reps; irep = irep + 1) {
67+
// Awkward expression for loop counter quiets C++20 compiler warning
68+
for (RepIndex_type irep = 0; irep < run_reps; ((irep = irep + 1), 0)) {
6769

6870
HISTOGRAM_INIT_COUNTS;
6971

@@ -87,7 +89,8 @@ void HISTOGRAM::runOpenMPVariant(VariantID vid, size_t RAJAPERF_UNUSED_ARG(tune_
8789
auto res{getHostResource()};
8890

8991
startTimer();
90-
for (RepIndex_type irep = 0; irep < run_reps; irep = irep + 1) {
92+
// Awkward expression for loop counter quiets C++20 compiler warning
93+
for (RepIndex_type irep = 0; irep < run_reps; ((irep = irep + 1), 0)) {
9194

9295
HISTOGRAM_INIT_COUNTS_RAJA(RAJA::omp_multi_reduce);
9396

‎src/algorithm/HISTOGRAM-OMPTarget.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ void HISTOGRAM::runOpenMPTargetVariant(VariantID vid, size_t RAJAPERF_UNUSED_ARG
4040
HISTOGRAM_SETUP_COUNTS;
4141

4242
startTimer();
43-
for (RepIndex_type irep = 0; irep < run_reps; irep = irep + 1) {
43+
// Awkward expression for loop counter quiets C++20 compiler warning
44+
for (RepIndex_type irep = 0; irep < run_reps; ((irep = irep + 1), 0)) {
4445

4546
initOpenMPDeviceData(counts, counts_init, num_bins);
4647

‎src/algorithm/HISTOGRAM-Seq.cpp‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ void HISTOGRAM::runSeqVariant(VariantID vid, size_t RAJAPERF_UNUSED_ARG(tune_idx
3333
HISTOGRAM_SETUP_COUNTS;
3434

3535
startTimer();
36-
for (RepIndex_type irep = 0; irep < run_reps; irep = irep + 1) {
36+
// Awkward expression for loop counter quiets C++20 compiler warning
37+
for (RepIndex_type irep = 0; irep < run_reps; ((irep = irep + 1), 0)) {
3738

3839
HISTOGRAM_INIT_COUNTS;
3940

@@ -61,7 +62,8 @@ void HISTOGRAM::runSeqVariant(VariantID vid, size_t RAJAPERF_UNUSED_ARG(tune_idx
6162
};
6263

6364
startTimer();
64-
for (RepIndex_type irep = 0; irep < run_reps; irep = irep + 1) {
65+
// Awkward expression for loop counter quiets C++20 compiler warning
66+
for (RepIndex_type irep = 0; irep < run_reps; ((irep = irep + 1), 0)) {
6567

6668
HISTOGRAM_INIT_COUNTS;
6769

@@ -84,7 +86,8 @@ void HISTOGRAM::runSeqVariant(VariantID vid, size_t RAJAPERF_UNUSED_ARG(tune_idx
8486
auto res{getHostResource()};
8587

8688
startTimer();
87-
for (RepIndex_type irep = 0; irep < run_reps; irep = irep + 1) {
89+
// Awkward expression for loop counter quiets C++20 compiler warning
90+
for (RepIndex_type irep = 0; irep < run_reps; ((irep = irep + 1), 0)) {
8891

8992
HISTOGRAM_INIT_COUNTS_RAJA(RAJA::seq_multi_reduce);
9093

0 commit comments

Comments
 (0)