Skip to content

Commit 5c0d759

Browse files
author
Kent Knox
committed
Removed ::cerr wrt calling reference and clblas
Each test case was printing Calling reference xxx routine... Calling clblas xxx routine...
1 parent 1e86e34 commit 5c0d759

Some content is hidden

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

48 files changed

+8
-442
lines changed

‎src/tests/correctness/corr-asum.cpp

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -107,20 +107,15 @@ asumCorrectnessTest(TestParams *params)
107107
}
108108

109109
srand(params->seed);
110-
::std::cerr << "Generating input data... ";
111110

112111
randomVectors<T1>(params->N, (blasX + params->offBX), params->incx, (T1*)NULL, 0, true);
113-
::std::cerr << "Done" << ::std::endl;
114112

115113
// Allocate buffers
116114
bufX = base->createEnqueueBuffer(blasX, (lengthX + params->offBX)* sizeof(*blasX), 0, CL_MEM_READ_WRITE);
117115
bufAsum = base->createEnqueueBuffer(NULL, (1 + params->offa) * sizeof(T2), 0, CL_MEM_READ_WRITE);
118116
scratchBuff = base->createEnqueueBuffer(NULL, (lengthX * sizeof(T1)), 0, CL_MEM_READ_WRITE);
119117

120-
::std::cerr << "Calling reference xASUM routine... ";
121-
122118
*blasAsum = ::clMath::blas::asum( params->N, blasX, params->offBX, params->incx);
123-
::std::cerr << "Done" << ::std::endl;
124119

125120
if ((bufX == NULL) || (bufAsum == NULL) || (scratchBuff == NULL)) {
126121
releaseMemObjects(bufX, bufAsum, scratchBuff);
@@ -136,8 +131,6 @@ asumCorrectnessTest(TestParams *params)
136131
return;
137132
}
138133

139-
::std::cerr << "Calling clblas xASUM routine... ";
140-
141134
DataType type;
142135
type = ( typeid(T1) == typeid(cl_float))? TYPE_FLOAT : ( typeid(T1) == typeid(cl_double))? TYPE_DOUBLE: ( typeid(T1) == typeid(cl_float2))? TYPE_COMPLEX_FLOAT:TYPE_COMPLEX_DOUBLE;
143136

@@ -163,8 +156,6 @@ asumCorrectnessTest(TestParams *params)
163156
delete[] events;
164157
ASSERT_EQ(CL_SUCCESS, err) << "waitForSuccessfulFinish()";
165158
}
166-
::std::cerr << "Done" << ::std::endl;
167-
168159

169160
err = clEnqueueReadBuffer(base->commandQueues()[0], bufAsum, CL_TRUE, 0,
170161
(1 + params->offa) * sizeof(*clblasAsum), clblasAsum, 0,

‎src/tests/correctness/corr-axpy.cpp

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -111,17 +111,13 @@ axpyCorrectnessTest(TestParams *params)
111111

112112
srand(params->seed);
113113

114-
::std::cerr << "Generating input data... ";
115-
116114
// Populate X and Y
117115
randomVectors(params->N, (X+params->offBX), params->incx, (Y+params->offCY), params->incy);
118116

119117
memcpy(blasX, X, (lengthX + params->offBX) * sizeof(T));
120118
memcpy(blasY, Y, (lengthY + params->offCY) * sizeof(T));
121119
alpha = convertMultiplier<T>(params->alpha);
122120

123-
::std::cerr << "Done" << ::std::endl;
124-
125121
// Allocate buffers
126122
bufX = base->createEnqueueBuffer(X, (lengthX + params->offBX)* sizeof(T), 0, CL_MEM_READ_ONLY);
127123
bufY = base->createEnqueueBuffer(Y, (lengthY + params->offCY)* sizeof(T), 0, CL_MEM_READ_WRITE);
@@ -142,14 +138,8 @@ axpyCorrectnessTest(TestParams *params)
142138
return;
143139
}
144140

145-
::std::cerr << "Calling reference xAXPY routine... ";
146-
147141
::clMath::blas::axpy((size_t)params->N, alpha, blasX, (size_t)params->offBX, params->incx,
148142
blasY, (size_t)params->offCY, params->incy);
149-
::std::cerr << "Done" << ::std::endl;
150-
151-
152-
::std::cerr << "Calling clblas xAXPY routine... ";
153143

154144
err = (cl_int)::clMath::clblas::axpy(params->N, alpha, bufX, params->offBX, params->incx, bufY, params->offCY, params->incy,
155145
params->numCommandQueues, base->commandQueues(), 0, NULL, events);
@@ -169,8 +159,6 @@ axpyCorrectnessTest(TestParams *params)
169159
delete[] events;
170160
ASSERT_EQ(CL_SUCCESS, err) << "waitForSuccessfulFinish()";
171161
}
172-
::std::cerr << "Done" << ::std::endl;
173-
174162

175163
err = clEnqueueReadBuffer(base->commandQueues()[0], bufY, CL_TRUE, 0,
176164
(lengthY + params->offCY) * sizeof(T), Y, 0, NULL, NULL);

‎src/tests/correctness/corr-copy.cpp

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -104,22 +104,15 @@ copyCorrectnessTest(TestParams *params)
104104

105105
srand(params->seed);
106106

107-
::std::cerr << "Generating input data... ";
108-
109107
// Populate A and blasX
110108
randomVectors( params->N, (blasX+params->offBX), params->incx, (blasY+params->offCY), params->incy );
111109
memcpy(clblasY, blasY, (lengthY + params->offCY)* sizeof(*blasY));
112110

113-
::std::cerr << "Done" << ::std::endl;
114-
115111
// Allocate buffers
116112
bufX = base->createEnqueueBuffer(blasX, (lengthX + params->offBX)* sizeof(*blasX), 0, CL_MEM_READ_WRITE);
117113
bufY = base->createEnqueueBuffer(blasY, (lengthY + params->offCY)* sizeof(*blasY), 0, CL_MEM_READ_WRITE);
118114

119-
::std::cerr << "Calling reference xCOPY routine... ";
120-
121115
::clMath::blas::copy( params->N, blasX, params->offBX, params->incx, blasY, params->offCY, params->incy);
122-
::std::cerr << "Done" << ::std::endl;
123116

124117
if ((bufX == NULL) || (bufY == NULL)) {
125118
/* Skip the test, the most probable reason is
@@ -137,8 +130,6 @@ copyCorrectnessTest(TestParams *params)
137130
return;
138131
}
139132

140-
::std::cerr << "Calling clblas xCOPY routine... ";
141-
142133
DataType type;
143134
type = ( typeid(T) == typeid(cl_float))? TYPE_FLOAT : ( typeid(T) == typeid(cl_double))? TYPE_DOUBLE: ( typeid(T) == typeid(cl_float2))? TYPE_COMPLEX_FLOAT:TYPE_COMPLEX_DOUBLE;
144135

@@ -162,8 +153,6 @@ copyCorrectnessTest(TestParams *params)
162153
delete[] events;
163154
ASSERT_EQ(CL_SUCCESS, err) << "waitForSuccessfulFinish()";
164155
}
165-
::std::cerr << "Done" << ::std::endl;
166-
167156

168157
err = clEnqueueReadBuffer(base->commandQueues()[0], bufY, CL_TRUE, 0,
169158
((lengthY + params->offCY) * sizeof(*blasY)), clblasY, 0,

‎src/tests/correctness/corr-dot.cpp

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -115,21 +115,16 @@ dotCorrectnessTest(TestParams *params)
115115
}
116116

117117
srand(params->seed);
118-
::std::cerr << "Generating input data... ";
119118

120119
randomVectors(params->N, (blasX + params->offBX), params->incx, (blasY + params->offCY), params->incy, true);
121-
::std::cerr << "Done" << ::std::endl;
122120

123121
// Allocate buffers
124122
bufX = base->createEnqueueBuffer(blasX, (lengthX + params->offBX)* sizeof(*blasX), 0, CL_MEM_READ_WRITE);
125123
bufY = base->createEnqueueBuffer(blasY, (lengthY + params->offCY)* sizeof(*blasY), 0, CL_MEM_READ_WRITE);
126124
bufDP = base->createEnqueueBuffer(NULL, (1 + params->offa) * sizeof(T), 0, CL_MEM_READ_WRITE);
127125
scratchBuff = base->createEnqueueBuffer(NULL, (lengthX * sizeof(T)), 0, CL_MEM_READ_WRITE);
128126

129-
::std::cerr << "Calling reference xDOT routine... ";
130-
131127
*blasDP = ::clMath::blas::dot( params->N, blasX, params->offBX, params->incx, blasY, params->offCY, params->incy);
132-
::std::cerr << "Done" << ::std::endl;
133128

134129
if ((bufX == NULL) || (bufY == NULL) || (bufDP == NULL) || (scratchBuff == NULL)) {
135130
releaseMemObjects(bufX, bufY, bufDP, scratchBuff);
@@ -144,8 +139,6 @@ dotCorrectnessTest(TestParams *params)
144139
return;
145140
}
146141

147-
::std::cerr << "Calling clblas xDOT routine... ";
148-
149142
DataType type;
150143
type = ( typeid(T) == typeid(cl_float))? TYPE_FLOAT : ( typeid(T) == typeid(cl_double))? TYPE_DOUBLE: ( typeid(T) == typeid(cl_float2))? TYPE_COMPLEX_FLOAT:TYPE_COMPLEX_DOUBLE;
151144

@@ -169,8 +162,6 @@ dotCorrectnessTest(TestParams *params)
169162
delete[] events;
170163
ASSERT_EQ(CL_SUCCESS, err) << "waitForSuccessfulFinish()";
171164
}
172-
::std::cerr << "Done" << ::std::endl;
173-
174165

175166
err = clEnqueueReadBuffer(base->commandQueues()[0], bufDP, CL_TRUE, 0,
176167
(1 + params->offa) * sizeof(*clblasDP), clblasDP, 0,

‎src/tests/correctness/corr-dotc.cpp

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -115,21 +115,16 @@ dotcCorrectnessTest(TestParams *params)
115115
}
116116

117117
srand(params->seed);
118-
::std::cerr << "Generating input data... ";
119118

120119
randomVectors(params->N, (blasX + params->offBX), params->incx, (blasY + params->offCY), params->incy, true);
121-
::std::cerr << "Done" << ::std::endl;
122120

123121
// Allocate buffers
124122
bufX = base->createEnqueueBuffer(blasX, (lengthX + params->offBX)* sizeof(*blasX), 0, CL_MEM_READ_WRITE);
125123
bufY = base->createEnqueueBuffer(blasY, (lengthY + params->offCY)* sizeof(*blasY), 0, CL_MEM_READ_WRITE);
126124
bufDP = base->createEnqueueBuffer(NULL, (1 + params->offa) * sizeof(T), 0, CL_MEM_READ_WRITE);
127125
scratchBuff = base->createEnqueueBuffer(NULL, (lengthX * sizeof(T)), 0, CL_MEM_READ_WRITE);
128126

129-
::std::cerr << "Calling reference xDOTC routine... ";
130-
131127
*blasDP = ::clMath::blas::dotc( params->N, blasX, params->offBX, params->incx, blasY, params->offCY, params->incy);
132-
::std::cerr << "Done" << ::std::endl;
133128

134129
if ((bufX == NULL) || (bufY == NULL) || (bufDP == NULL) || (scratchBuff == NULL)) {
135130
releaseMemObjects(bufX, bufY, bufDP, scratchBuff);
@@ -144,8 +139,6 @@ dotcCorrectnessTest(TestParams *params)
144139
return;
145140
}
146141

147-
::std::cerr << "Calling clblas xDOTC routine... ";
148-
149142
DataType type;
150143
type = ( typeid(T) == typeid(cl_float))? TYPE_FLOAT : ( typeid(T) == typeid(cl_double))? TYPE_DOUBLE: ( typeid(T) == typeid(cl_float2))? TYPE_COMPLEX_FLOAT:TYPE_COMPLEX_DOUBLE;
151144

@@ -169,8 +162,6 @@ dotcCorrectnessTest(TestParams *params)
169162
delete[] events;
170163
ASSERT_EQ(CL_SUCCESS, err) << "waitForSuccessfulFinish()";
171164
}
172-
::std::cerr << "Done" << ::std::endl;
173-
174165

175166
err = clEnqueueReadBuffer(base->commandQueues()[0], bufDP, CL_TRUE, 0,
176167
(1 + params->offa) * sizeof(*clblasDP), clblasDP, 0,

‎src/tests/correctness/corr-gbmv.cpp

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,6 @@ gbmvCorrectnessTest(TestParams *params)
112112

113113
srand(params->seed);
114114

115-
::std::cerr << "Generating input data... ";
116-
117115
if((A == NULL) || (X == NULL) || (blasY == NULL) || (clblasY == NULL))
118116
{
119117
deleteBuffers<T>(A, X, blasY, clblasY);
@@ -130,15 +128,12 @@ gbmvCorrectnessTest(TestParams *params)
130128
(A + params->offA), params->lda, (X+params->offBX), params->incx, (blasY+params->offCY), params->incy );
131129
// Copy blasY to clblasY
132130
memcpy(clblasY, blasY, (lengthY + params->offCY)* sizeof(*blasY));
133-
::std::cerr << "Done" << ::std::endl;
134131

135132
// Allocate buffers
136133
bufA = base->createEnqueueBuffer(A, (lengthA + params->offA)* sizeof(*A), 0, CL_MEM_READ_ONLY);
137134
bufX = base->createEnqueueBuffer(X, (lengthX + params->offBX)* sizeof(*X), 0, CL_MEM_READ_ONLY);
138135
bufY = base->createEnqueueBuffer(clblasY, (lengthY + params->offCY) * sizeof(*clblasY), 0, CL_MEM_READ_WRITE);
139136

140-
::std::cerr << "Calling reference xGBMV routine... ";
141-
142137
clblasOrder fOrder;
143138
clblasTranspose fTrans;
144139
fOrder = params->order;
@@ -159,7 +154,6 @@ gbmvCorrectnessTest(TestParams *params)
159154
}
160155
clMath::blas::gbmv(fOrder, fTrans, fM, fN, fKL, fKU, alpha, A, params->offA, params->lda,
161156
X, params->offBX, params->incx, beta, blasY, params->offCY, params->incy);
162-
::std::cerr << "Done" << ::std::endl;
163157

164158
if ((bufA == NULL) || (bufX == NULL) || (bufY == NULL)) {
165159
// Skip the test, the most probable reason is
@@ -177,8 +171,6 @@ gbmvCorrectnessTest(TestParams *params)
177171
return;
178172
}
179173

180-
::std::cerr << "Calling clblas xGBMV routine... ";
181-
182174
err = (cl_int)clMath::clblas::gbmv(params->order, params->transA, params->M, params->N, params->KL, params->KU,
183175
alpha, bufA, params->offA, params->lda, bufX, params->offBX, params->incx,
184176
beta, bufY, params->offCY, params->incy,
@@ -199,8 +191,6 @@ gbmvCorrectnessTest(TestParams *params)
199191
delete[] events;
200192
ASSERT_EQ(CL_SUCCESS, err) << "waitForSuccessfulFinish()";
201193
}
202-
::std::cerr << "Done" << ::std::endl;
203-
204194

205195
err = clEnqueueReadBuffer(base->commandQueues()[0], bufY, CL_TRUE, 0,
206196
(lengthY + params->offCY) * sizeof(*clblasY), clblasY, 0,

‎src/tests/correctness/corr-gemm.cpp

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,7 @@ gemmCorrectnessTest(TestParams *params)
7777
(typeid(T) == typeid(DoubleComplex)));
7878

7979
if (canCaseBeSkipped(params, isComplex)) {
80-
std::cerr << ">> Test is skipped because it has no importance for this "
81-
"level of coverage" << std::endl;
80+
std::cerr << ">> Test is skipped" << std::endl;
8281
SUCCEED();
8382
return;
8483
}
@@ -111,7 +110,6 @@ gemmCorrectnessTest(TestParams *params)
111110
memcpy(clblasC, blasC, params->rowsC * params->columnsC * sizeof(*blasC));
112111
//::std::cerr << "Done" << ::std::endl;
113112

114-
//::std::cerr << "Calling reference xGEMM routine... ";
115113
if (params->order == clblasColumnMajor) {
116114
::clMath::blas::gemm(clblasColumnMajor, params->transA, params->transB,
117115
params->M, params->N, params->K, alpha, A,
@@ -139,7 +137,6 @@ gemmCorrectnessTest(TestParams *params)
139137
delete[] reorderedB;
140138
delete[] reorderedA;
141139
}
142-
//::std::cerr << "Done" << ::std::endl;
143140

144141
bufA = base->createEnqueueBuffer(A, params->rowsA * params->columnsA *
145142
sizeof(*A), params->offA * sizeof(*A),
@@ -167,7 +164,6 @@ gemmCorrectnessTest(TestParams *params)
167164
return;
168165
}
169166

170-
//::std::cerr << "Calling clblas xGEMM routine... ";
171167
err = (cl_int)::clMath::clblas::gemm(params->order, params->transA,
172168
params->transB, params->M, params->N, params->K, alpha, bufA,
173169
params->offA, params->lda, bufB, params->offBX, params->ldb, beta,
@@ -188,7 +184,6 @@ gemmCorrectnessTest(TestParams *params)
188184
delete[] events;
189185
ASSERT_EQ(CL_SUCCESS, err) << "waitForSuccessfulFinish()";
190186
}
191-
//::std::cerr << "Done" << ::std::endl;
192187

193188
clEnqueueReadBuffer(base->commandQueues()[0], bufC, CL_TRUE,
194189
params->offCY * sizeof(*clblasC),

‎src/tests/correctness/corr-gemm2.cpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -120,14 +120,11 @@ gemm2CorrectnessTest(TestParams *params)
120120
beta = convertMultiplier<T>(params->beta);
121121
}
122122

123-
::std::cerr << "Generating input data... ";
124123
randomGemmMatrices<T>(params->order, params->transA, params->transB,
125124
params->M, params->N, params->K, useAlpha, &alpha, A, params->lda,
126125
B, params->ldb, useBeta, &beta, blasC, params->ldc);
127126
memcpy(clblasC, blasC, params->rowsC * params->columnsC * sizeof(*blasC));
128-
::std::cerr << "Done" << ::std::endl;
129127

130-
::std::cerr << "Calling reference xGEMM routine... ";
131128
if (params->order == clblasColumnMajor) {
132129
::clMath::blas::gemm(clblasColumnMajor, params->transA, params->transB,
133130
params->M, params->N, params->K, alpha, A,
@@ -162,7 +159,6 @@ gemm2CorrectnessTest(TestParams *params)
162159
delete[] reorderedB;
163160
delete[] reorderedA;
164161
}
165-
::std::cerr << "Done" << ::std::endl;
166162

167163
bufA = base->createEnqueueBuffer(A, params->rowsA * params->columnsA *
168164
sizeof(*A), params->offA * sizeof(*A),
@@ -190,7 +186,6 @@ gemm2CorrectnessTest(TestParams *params)
190186
return;
191187
}
192188

193-
::std::cerr << "Calling clblas xGEMM routine... ";
194189
err = (cl_int)::clMath::clblas::gemm2(params->order, params->transA,
195190
params->transB, params->M, params->N, params->K, alpha, bufA,
196191
params->offA, params->lda, bufB, params->offBX, params->ldb, beta,
@@ -211,7 +206,6 @@ gemm2CorrectnessTest(TestParams *params)
211206
delete[] events;
212207
ASSERT_EQ(CL_SUCCESS, err) << "waitForSuccessfulFinish()";
213208
}
214-
::std::cerr << "Done" << ::std::endl;
215209

216210
clEnqueueReadBuffer(base->commandQueues()[0], bufC, CL_TRUE,
217211
params->offCY * sizeof(*clblasC),

‎src/tests/correctness/corr-gemv.cpp

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,7 @@ gemvCorrectnessTest(TestParams *params)
7777
isComplex = ((typeid(T) == typeid(FloatComplex)) ||
7878
(typeid(T) == typeid(DoubleComplex)));
7979
if (canCaseBeSkipped(params, isComplex)) {
80-
std::cerr << ">> Test is skipped because it has no importance for this "
81-
"level of coverage" << std::endl;
80+
std::cerr << ">> Test is skipped" << std::endl;
8281
SUCCEED();
8382
return;
8483
}
@@ -115,7 +114,6 @@ gemvCorrectnessTest(TestParams *params)
115114
lenY = params->N;
116115
}
117116

118-
::std::cerr << "Generating input data... ";
119117
setNans<T>(params->rowsA * params->columnsA, A);
120118
setNans<T>(params->rowsB * params->columnsB, B);
121119
setNans<T>(params->rowsC * params->columnsC, blasC);
@@ -134,9 +132,6 @@ gemvCorrectnessTest(TestParams *params)
134132
params->columnsC * params->rowsC);
135133
memcpy(clblasC, blasC, params->rowsC * params->columnsC * sizeof(*clblasC));
136134

137-
::std::cerr << "Done" << ::std::endl;
138-
139-
::std::cerr << "Calling reference xGEMV routine... ";
140135
if (params->order == clblasColumnMajor) {
141136
::clMath::blas::gemv(clblasColumnMajor, params->transA,
142137
params->M, params->N, alpha, A, params->lda,
@@ -153,7 +148,6 @@ gemvCorrectnessTest(TestParams *params)
153148

154149
delete[] reorderedA;
155150
}
156-
::std::cerr << "Done" << ::std::endl;
157151

158152
bufA = base->createEnqueueBuffer(A, params->rowsA * params->columnsA *
159153
sizeof(*A), params->offA * sizeof(*A),
@@ -178,7 +172,6 @@ gemvCorrectnessTest(TestParams *params)
178172
return;
179173
}
180174

181-
::std::cerr << "Calling clblas xGEMV routine... ";
182175
err = (cl_int)::clMath::clblas::gemv(params->order, params->transA,
183176
params->M, params->N, alpha, bufA, params->offA, params->lda,
184177
bufB, params->offBX, params->incx, beta, bufC, params->offCY,
@@ -199,7 +192,6 @@ gemvCorrectnessTest(TestParams *params)
199192
delete[] events;
200193
ASSERT_EQ(CL_SUCCESS, err) << "waitForSuccessfulFinish()";
201194
}
202-
::std::cerr << "Done" << ::std::endl;
203195

204196
clEnqueueReadBuffer(base->commandQueues()[0], bufC, CL_TRUE, 0,
205197
params->rowsC * params->columnsC * sizeof(*clblasC),

0 commit comments

Comments
 (0)