Skip to content

Commit 59243d4

Browse files
martin-frbgmartin-frbg
authored
Merge pull request #2479 from Darkness303/develop
Fix potential index overflows at large matrix sizes in the benchmark codes
2 parents d41f83e + 0f65c05 commit 59243d4

19 files changed

Lines changed: 83 additions & 77 deletions

File tree

‎benchmark/cholesky.c‎

Lines changed: 30 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -173,46 +173,46 @@ int main(int argc, char *argv[]){
173173
#ifndef COMPLEX
174174
if (uplos & 1) {
175175
for (j = 0; j < m; j++) {
176-
for(i = 0; i < j; i++) a[i + j * m] = 0.;
177-
a[j + j * m] = ((double) rand() / (double) RAND_MAX) + 8.;
178-
for(i = j + 1; i < m; i++) a[i + j * m] = ((double) rand() / (double) RAND_MAX) - 0.5;
176+
for(i = 0; i < j; i++) a[(long)i + (long)j * (long)m] = 0.;
177+
a[(long)j + (long)j * (long)m] = ((double) rand() / (double) RAND_MAX) + 8.;
178+
for(i = j + 1; i < m; i++) a[(long)i + (long)j * (long)m] = ((double) rand() / (double) RAND_MAX) - 0.5;
179179
}
180180
} else {
181181
for (j = 0; j < m; j++) {
182-
for(i = 0; i < j; i++) a[i + j * m] = ((double) rand() / (double) RAND_MAX) - 0.5;
183-
a[j + j * m] = ((double) rand() / (double) RAND_MAX) + 8.;
184-
for(i = j + 1; i < m; i++) a[i + j * m] = 0.;
182+
for(i = 0; i < j; i++) a[(long)i + (long)j * (long)m] = ((double) rand() / (double) RAND_MAX) - 0.5;
183+
a[(long)j + (long)j * (long)m] = ((double) rand() / (double) RAND_MAX) + 8.;
184+
for(i = j + 1; i < m; i++) a[(long)i + (long)j * (long)m] = 0.;
185185
}
186186
}
187187
#else
188188
if (uplos & 1) {
189189
for (j = 0; j < m; j++) {
190190
for(i = 0; i < j; i++) {
191-
a[(i + j * m) * 2 + 0] = 0.;
192-
a[(i + j * m) * 2 + 1] = 0.;
191+
a[((long)i + (long)j * (long)m) * 2 + 0] = 0.;
192+
a[((long)i + (long)j * (long)m) * 2 + 1] = 0.;
193193
}
194194

195-
a[(j + j * m) * 2 + 0] = ((double) rand() / (double) RAND_MAX) + 8.;
196-
a[(j + j * m) * 2 + 1] = 0.;
195+
a[((long)j + (long)j * (long)m) * 2 + 0] = ((double) rand() / (double) RAND_MAX) + 8.;
196+
a[((long)j + (long)j * (long)m) * 2 + 1] = 0.;
197197

198198
for(i = j + 1; i < m; i++) {
199-
a[(i + j * m) * 2 + 0] = ((double) rand() / (double) RAND_MAX) - 0.5;
200-
a[(i + j * m) * 2 + 1] = ((double) rand() / (double) RAND_MAX) - 0.5;
199+
a[((long)i + (long)j * (long)m) * 2 + 0] = ((double) rand() / (double) RAND_MAX) - 0.5;
200+
a[((long)i + (long)j * (long)m) * 2 + 1] = ((double) rand() / (double) RAND_MAX) - 0.5;
201201
}
202202
}
203203
} else {
204204
for (j = 0; j < m; j++) {
205205
for(i = 0; i < j; i++) {
206-
a[(i + j * m) * 2 + 0] = ((double) rand() / (double) RAND_MAX) - 0.5;
207-
a[(i + j * m) * 2 + 1] = ((double) rand() / (double) RAND_MAX) - 0.5;
206+
a[((long)i + (long)j * (long)m) * 2 + 0] = ((double) rand() / (double) RAND_MAX) - 0.5;
207+
a[((long)i + (long)j * (long)m) * 2 + 1] = ((double) rand() / (double) RAND_MAX) - 0.5;
208208
}
209209

210-
a[(j + j * m) * 2 + 0] = ((double) rand() / (double) RAND_MAX) + 8.;
211-
a[(j + j * m) * 2 + 1] = 0.;
210+
a[((long)j + (long)j * (long)m) * 2 + 0] = ((double) rand() / (double) RAND_MAX) + 8.;
211+
a[((long)j + (long)j * (long)m) * 2 + 1] = 0.;
212212

213213
for(i = j + 1; i < m; i++) {
214-
a[(i + j * m) * 2 + 0] = 0.;
215-
a[(i + j * m) * 2 + 1] = 0.;
214+
a[((long)i + (long)j * (long)m) * 2 + 0] = 0.;
215+
a[((long)i + (long)j * (long)m) * 2 + 1] = 0.;
216216
}
217217
}
218218
}
@@ -239,21 +239,27 @@ int main(int argc, char *argv[]){
239239
for (j = 0; j < m; j++) {
240240
for(i = 0; i <= j; i++) {
241241
#ifndef COMPLEX
242-
if (maxerr < fabs(a[i + j * m] - b[i + j * m])) maxerr = fabs(a[i + j * m] - b[i + j * m]);
242+
if (maxerr < fabs(a[(long)i + (long)j * (long)m] - b[(long)i + (long)j * (long)m]))
243+
maxerr = fabs(a[(long)i + (long)j * (long)m] - b[(long)i + (long)j * (long)m]);
243244
#else
244-
if (maxerr < fabs(a[(i + j * m) * 2 + 0] - b[(i + j * m) * 2 + 0])) maxerr = fabs(a[(i + j * m) * 2 + 0] - b[(i + j * m) * 2 + 0]);
245-
if (maxerr < fabs(a[(i + j * m) * 2 + 1] - b[(i + j * m) * 2 + 1])) maxerr = fabs(a[(i + j * m) * 2 + 1] - b[(i + j * m) * 2 + 1]);
245+
if (maxerr < fabs(a[((long)i + (long)j * (long)m) * 2 + 0] - b[((long)i + (long)j * (long)m) * 2 + 0]))
246+
maxerr = fabs(a[((long)i + (long)j * (long)m) * 2 + 0] - b[((long)i + (long)j * (long)m) * 2 + 0]);
247+
if (maxerr < fabs(a[((long)i + (long)j * (long)m) * 2 + 1] - b[((long)i + (long)j * (long)m) * 2 + 1]))
248+
maxerr = fabs(a[((long)i + (long)j * (long)m) * 2 + 1] - b[((long)i + (long)j * (long)m) * 2 + 1]);
246249
#endif
247250
}
248251
}
249252
} else {
250253
for (j = 0; j < m; j++) {
251254
for(i = j; i < m; i++) {
252255
#ifndef COMPLEX
253-
if (maxerr < fabs(a[i + j * m] - b[i + j * m])) maxerr = fabs(a[i + j * m] - b[i + j * m]);
256+
if (maxerr < fabs(a[(long)i + (long)j * (long)m] - b[(long)i + (long)j * (long)m]))
257+
maxerr = fabs(a[(long)i + (long)j * (long)m] - b[(long)i + (long)j * (long)m]);
254258
#else
255-
if (maxerr < fabs(a[(i + j * m) * 2 + 0] - b[(i + j * m) * 2 + 0])) maxerr = fabs(a[(i + j * m) * 2 + 0] - b[(i + j * m) * 2 + 0]);
256-
if (maxerr < fabs(a[(i + j * m) * 2 + 1] - b[(i + j * m) * 2 + 1])) maxerr = fabs(a[(i + j * m) * 2 + 1] - b[(i + j * m) * 2 + 1]);
259+
if (maxerr < fabs(a[((long)i + (long)j * (long)m) * 2 + 0] - b[((long)i + (long)j * (long)m) * 2 + 0]))
260+
maxerr = fabs(a[((long)i + (long)j * (long)m) * 2 + 0] - b[((long)i + (long)j * (long)m) * 2 + 0]);
261+
if (maxerr < fabs(a[((long)i + (long)j * (long)m) * 2 + 1] - b[((long)i + (long)j * (long)m) * 2 + 1]))
262+
maxerr = fabs(a[((long)i + (long)j * (long)m) * 2 + 1] - b[((long)i + (long)j * (long)m) * 2 + 1]);
257263
#endif
258264
}
259265
}

‎benchmark/geev.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ int main(int argc, char *argv[]){
195195

196196
for(j = 0; j < to; j++){
197197
for(i = 0; i < to * COMPSIZE; i++){
198-
a[i + j * to * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
198+
a[(long)i + (long)j * (long)to * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
199199
}
200200
}
201201

‎benchmark/gemm3m.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -181,9 +181,9 @@ int main(int argc, char *argv[]){
181181

182182
for(j = 0; j < m; j++){
183183
for(i = 0; i < m * COMPSIZE; i++){
184-
a[i + j * m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
185-
b[i + j * m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
186-
c[i + j * m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
184+
a[(long)i + (long)j * (long)m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
185+
b[(long)i + (long)j * (long)m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
186+
c[(long)i + (long)j * (long)m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
187187
}
188188
}
189189

‎benchmark/gemv.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ int main(int argc, char *argv[]){
197197
fprintf(stderr, " %6dx%d : ", (int)m,(int)n);
198198
for(j = 0; j < m; j++){
199199
for(i = 0; i < n * COMPSIZE; i++){
200-
a[j + i * m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
200+
a[(long)j + (long)i * (long)m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
201201
}
202202
}
203203

@@ -234,7 +234,7 @@ int main(int argc, char *argv[]){
234234
fprintf(stderr, " %6dx%d : ", (int)m,(int)n);
235235
for(j = 0; j < m; j++){
236236
for(i = 0; i < n * COMPSIZE; i++){
237-
a[j + i * m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
237+
a[(long)j + (long)i * (long)m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
238238
}
239239
}
240240

‎benchmark/ger.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ int main(int argc, char *argv[]){
182182

183183
for(j = 0; j < m; j++){
184184
for(i = 0; i < n * COMPSIZE; i++){
185-
a[i + j * m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
185+
a[(long)i + (long)j * (long)m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
186186
}
187187
}
188188

‎benchmark/gesv.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -177,20 +177,20 @@ int main(int argc, char *argv[]){
177177

178178
for(j = 0; j < m; j++){
179179
for(i = 0; i < m * COMPSIZE; i++){
180-
a[i + j * m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
180+
a[(long)i + (long)j * (long)m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
181181
}
182182
}
183183

184184
for(j = 0; j < m; j++){
185185
for(i = 0; i < m * COMPSIZE; i++){
186-
b[i + j * m * COMPSIZE] = 0.0;
186+
b[(long)i + (long)j * (long)m * COMPSIZE] = 0.0;
187187
}
188188
}
189189

190190

191191
for (j = 0; j < m; ++j) {
192192
for (i = 0; i < m * COMPSIZE; ++i) {
193-
b[i] += a[i + j * m * COMPSIZE];
193+
b[i] += a[(long)i + (long)j * (long)m * COMPSIZE];
194194
}
195195
}
196196

‎benchmark/getri.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ int main(int argc, char *argv[]){
172172

173173
for(j = 0; j < to; j++){
174174
for(i = 0; i < to * COMPSIZE; i++){
175-
a[i + j * to * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
175+
a[(long)i + (long)j * (long)to * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
176176
}
177177
}
178178

‎benchmark/hemm.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -164,9 +164,9 @@ int main(int argc, char *argv[]){
164164

165165
for(j = 0; j < m; j++){
166166
for(i = 0; i < m * COMPSIZE; i++){
167-
a[i + j * m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
168-
b[i + j * m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
169-
c[i + j * m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
167+
a[(long)i + (long)j * (long)m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
168+
b[(long)i + (long)j * (long)m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
169+
c[(long)i + (long)j * (long)m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
170170
}
171171
}
172172

‎benchmark/hemv.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ int main(int argc, char *argv[]){
167167

168168
for(j = 0; j < m; j++){
169169
for(i = 0; i < m * COMPSIZE; i++){
170-
a[i + j * m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
170+
a[(long)i + (long)j * (long)m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
171171
}
172172
}
173173

‎benchmark/her2k.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -163,9 +163,9 @@ int main(int argc, char *argv[]){
163163

164164
for(j = 0; j < m; j++){
165165
for(i = 0; i < m * COMPSIZE; i++){
166-
a[i + j * m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
167-
b[i + j * m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
168-
c[i + j * m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
166+
a[(long)i + (long)j * (long)m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
167+
b[(long)i + (long)j * (long)m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
168+
c[(long)i + (long)j * (long)m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
169169
}
170170
}
171171

0 commit comments

Comments
 (0)