Skip to content

Commit e1a6703

Browse files
martin-frbgmartin-frbg
authored
Cleanup and GEMMTR fixes
1 parent 4341911 commit e1a6703

9 files changed

Lines changed: 947 additions & 27 deletions

File tree

‎ctest/c_c3chke.c‎

Lines changed: 230 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,237 @@ void F77_c3chke(char * rout) {
4545
F77_xerbla(cblas_rout,&cblas_info);
4646
}
4747

48+
if (strncmp( sf,"cblas_cgemmtr" ,13)==0) {
49+
cblas_rout = "cblas_cgemmtr" ;
4850

49-
if (strncmp( sf,"cblas_cgemm" ,11)==0) {
51+
cblas_info = 1;
52+
cblas_cgemmtr( INVALID, CblasUpper, CblasNoTrans, CblasNoTrans, 0, 0,
53+
ALPHA, A, 1, B, 1, BETA, C, 1 );
54+
chkxer();
55+
cblas_info = 1;
56+
cblas_cgemmtr( INVALID, CblasUpper, CblasNoTrans, CblasTrans, 0, 0,
57+
ALPHA, A, 1, B, 1, BETA, C, 1 );
58+
chkxer();
59+
cblas_info = 1;
60+
cblas_cgemmtr( INVALID, CblasUpper,CblasTrans, CblasNoTrans, 0, 0,
61+
ALPHA, A, 1, B, 1, BETA, C, 1 );
62+
chkxer();
63+
cblas_info = 1;
64+
cblas_cgemmtr( INVALID, CblasUpper, CblasTrans, CblasTrans, 0, 0,
65+
ALPHA, A, 1, B, 1, BETA, C, 1 );
66+
chkxer();
67+
68+
cblas_info = 1;
69+
cblas_cgemmtr( INVALID, CblasLower, CblasNoTrans, CblasNoTrans, 0, 0,
70+
ALPHA, A, 1, B, 1, BETA, C, 1 );
71+
chkxer();
72+
cblas_info = 1;
73+
cblas_cgemmtr( INVALID, CblasLower, CblasNoTrans, CblasTrans, 0, 0,
74+
ALPHA, A, 1, B, 1, BETA, C, 1 );
75+
chkxer();
76+
cblas_info = 1;
77+
cblas_cgemmtr( INVALID, CblasLower,CblasTrans, CblasNoTrans, 0, 0,
78+
ALPHA, A, 1, B, 1, BETA, C, 1 );
79+
chkxer();
80+
cblas_info = 1;
81+
cblas_cgemmtr( INVALID, CblasLower, CblasTrans, CblasTrans, 0, 0,
82+
ALPHA, A, 1, B, 1, BETA, C, 1 );
83+
chkxer();
84+
85+
cblas_info = 2; RowMajorStrg = FALSE;
86+
cblas_cgemmtr( CblasColMajor, INVALID, CblasNoTrans, CblasNoTrans, 0, 0,
87+
ALPHA, A, 1, B, 1, BETA, C, 1 );
88+
chkxer();
89+
cblas_info = 2; RowMajorStrg = FALSE;
90+
cblas_cgemmtr( CblasColMajor, INVALID, CblasNoTrans, CblasTrans, 0, 0,
91+
ALPHA, A, 1, B, 1, BETA, C, 1 );
92+
chkxer();
93+
94+
cblas_info = 3; RowMajorStrg = FALSE;
95+
cblas_cgemmtr( CblasColMajor, CblasUpper, INVALID, CblasNoTrans, 0, 0,
96+
ALPHA, A, 1, B, 1, BETA, C, 1 );
97+
chkxer();
98+
cblas_info = 3; RowMajorStrg = FALSE;
99+
cblas_cgemmtr( CblasColMajor, CblasUpper, INVALID, CblasTrans, 0, 0,
100+
ALPHA, A, 1, B, 1, BETA, C, 1 );
101+
chkxer();
102+
103+
cblas_info = 4; RowMajorStrg = FALSE;
104+
cblas_cgemmtr( CblasColMajor, CblasUpper, CblasNoTrans, INVALID, 0, 0,
105+
ALPHA, A, 1, B, 1, BETA, C, 1 );
106+
chkxer();
107+
cblas_info = 4; RowMajorStrg = FALSE;
108+
cblas_cgemmtr( CblasColMajor, CblasUpper, CblasTrans, INVALID, 0, 0,
109+
ALPHA, A, 1, B, 1, BETA, C, 1 );
110+
chkxer();
111+
112+
113+
cblas_info = 5; RowMajorStrg = FALSE;
114+
cblas_cgemmtr( CblasColMajor, CblasUpper, CblasNoTrans, CblasNoTrans, INVALID, 0,
115+
ALPHA, A, 1, B, 1, BETA, C, 1 );
116+
chkxer();
117+
cblas_info = 5; RowMajorStrg = FALSE;
118+
cblas_cgemmtr( CblasColMajor, CblasUpper, CblasNoTrans, CblasTrans, INVALID, 0,
119+
ALPHA, A, 1, B, 1, BETA, C, 1 );
120+
chkxer();
121+
cblas_info = 5; RowMajorStrg = FALSE;
122+
cblas_cgemmtr( CblasColMajor, CblasUpper, CblasTrans, CblasNoTrans, INVALID, 0,
123+
ALPHA, A, 1, B, 1, BETA, C, 1 );
124+
chkxer();
125+
cblas_info = 5; RowMajorStrg = FALSE;
126+
cblas_cgemmtr( CblasColMajor, CblasUpper, CblasTrans, CblasTrans, INVALID, 0,
127+
ALPHA, A, 1, B, 1, BETA, C, 1 );
128+
chkxer();
129+
130+
cblas_info = 6; RowMajorStrg = FALSE;
131+
cblas_cgemmtr( CblasColMajor, CblasUpper, CblasNoTrans, CblasNoTrans, 0, INVALID,
132+
ALPHA, A, 1, B, 1, BETA, C, 1 );
133+
chkxer();
134+
cblas_info = 6; RowMajorStrg = FALSE;
135+
cblas_cgemmtr( CblasColMajor, CblasUpper, CblasNoTrans, CblasTrans, 0, INVALID,
136+
ALPHA, A, 1, B, 1, BETA, C, 1 );
137+
chkxer();
138+
cblas_info = 6; RowMajorStrg = FALSE;
139+
cblas_cgemmtr( CblasColMajor, CblasUpper, CblasTrans, CblasNoTrans, 0, INVALID,
140+
ALPHA, A, 1, B, 1, BETA, C, 1 );
141+
chkxer();
142+
cblas_info = 6; RowMajorStrg = FALSE;
143+
cblas_cgemmtr( CblasColMajor, CblasUpper, CblasTrans, CblasTrans, 0, INVALID,
144+
ALPHA, A, 1, B, 1, BETA, C, 1 );
145+
chkxer();
146+
147+
148+
cblas_info = 9; RowMajorStrg = FALSE;
149+
cblas_cgemmtr( CblasColMajor, CblasUpper, CblasNoTrans, CblasNoTrans, 2, 0,
150+
ALPHA, A, 1, B, 1, BETA, C, 2 );
151+
chkxer();
152+
cblas_info = 9; RowMajorStrg = FALSE;
153+
cblas_cgemmtr( CblasColMajor, CblasUpper, CblasNoTrans, CblasTrans, 2, 0,
154+
ALPHA, A, 1, B, 1, BETA, C, 2 );
155+
chkxer();
156+
cblas_info = 9; RowMajorStrg = FALSE;
157+
cblas_cgemmtr( CblasColMajor, CblasUpper, CblasTrans, CblasNoTrans, 0, 2,
158+
ALPHA, A, 1, B, 2, BETA, C, 1 );
159+
chkxer();
160+
cblas_info = 9; RowMajorStrg = FALSE;
161+
cblas_cgemmtr( CblasColMajor, CblasUpper, CblasTrans, CblasTrans, 0, 2,
162+
ALPHA, A, 1, B, 1, BETA, C, 1 );
163+
chkxer();
164+
165+
cblas_info = 11; RowMajorStrg = FALSE;
166+
cblas_cgemmtr( CblasColMajor, CblasUpper, CblasNoTrans, CblasNoTrans, 0, 2,
167+
ALPHA, A, 1, B, 1, BETA, C, 1 );
168+
chkxer();
169+
cblas_info = 11; RowMajorStrg = FALSE;
170+
cblas_cgemmtr( CblasColMajor, CblasUpper, CblasTrans, CblasNoTrans, 0, 2,
171+
ALPHA, A, 2, B, 1, BETA, C, 1 );
172+
chkxer();
173+
cblas_info = 11; RowMajorStrg = FALSE;
174+
cblas_cgemmtr( CblasColMajor, CblasUpper, CblasTrans, CblasTrans, 2, 0,
175+
ALPHA, A, 1, B, 1, BETA, C, 1 );
176+
chkxer();
177+
178+
cblas_info = 14; RowMajorStrg = FALSE;
179+
cblas_cgemmtr( CblasColMajor, CblasUpper, CblasNoTrans, CblasNoTrans, 2, 0,
180+
ALPHA, A, 2, B, 1, BETA, C, 1 );
181+
chkxer();
182+
cblas_info = 14; RowMajorStrg = FALSE;
183+
cblas_cgemmtr( CblasColMajor, CblasUpper, CblasNoTrans, CblasTrans, 2, 0,
184+
ALPHA, A, 2, B, 2, BETA, C, 1 );
185+
chkxer();
186+
187+
cblas_info = 14; RowMajorStrg = FALSE;
188+
cblas_cgemmtr( CblasColMajor, CblasUpper, CblasTrans, CblasNoTrans, 2, 0,
189+
ALPHA, A, 2, B, 1, BETA, C, 1 );
190+
chkxer();
191+
cblas_info = 14; RowMajorStrg = FALSE;
192+
cblas_cgemmtr( CblasColMajor, CblasUpper, CblasTrans, CblasTrans, 2, 0,
193+
ALPHA, A, 2, B, 2, BETA, C, 1 );
194+
chkxer();
195+
196+
/* Row Major */
197+
cblas_info = 5; RowMajorStrg = TRUE;
198+
cblas_cgemmtr( CblasRowMajor, CblasUpper, CblasNoTrans, CblasNoTrans, INVALID, 0,
199+
ALPHA, A, 1, B, 1, BETA, C, 1 );
200+
chkxer();
201+
cblas_info = 5; RowMajorStrg = TRUE;
202+
cblas_cgemmtr( CblasRowMajor, CblasUpper, CblasNoTrans, CblasTrans, INVALID, 0,
203+
ALPHA, A, 1, B, 1, BETA, C, 1 );
204+
chkxer();
205+
cblas_info = 5; RowMajorStrg = TRUE;
206+
cblas_cgemmtr( CblasRowMajor, CblasUpper, CblasTrans, CblasNoTrans, INVALID, 0,
207+
ALPHA, A, 1, B, 1, BETA, C, 1 );
208+
chkxer();
209+
cblas_info = 5; RowMajorStrg = TRUE;
210+
cblas_cgemmtr( CblasRowMajor, CblasUpper, CblasTrans, CblasTrans, INVALID, 0,
211+
ALPHA, A, 1, B, 1, BETA, C, 1 );
212+
chkxer();
213+
214+
cblas_info = 6; RowMajorStrg = TRUE;
215+
cblas_cgemmtr( CblasRowMajor, CblasUpper, CblasNoTrans, CblasNoTrans, 0, INVALID,
216+
ALPHA, A, 1, B, 1, BETA, C, 1 );
217+
chkxer();
218+
cblas_info = 6; RowMajorStrg = TRUE;
219+
cblas_cgemmtr( CblasRowMajor, CblasUpper, CblasNoTrans, CblasTrans, 0, INVALID,
220+
ALPHA, A, 1, B, 1, BETA, C, 1 );
221+
chkxer();
222+
cblas_info = 6; RowMajorStrg = TRUE;
223+
cblas_cgemmtr( CblasRowMajor, CblasUpper, CblasTrans, CblasNoTrans, 0, INVALID,
224+
ALPHA, A, 1, B, 1, BETA, C, 1 );
225+
chkxer();
226+
cblas_info = 6; RowMajorStrg = TRUE;
227+
cblas_cgemmtr( CblasRowMajor, CblasUpper, CblasTrans, CblasTrans, 0, INVALID,
228+
ALPHA, A, 1, B, 1, BETA, C, 1 );
229+
chkxer();
230+
231+
cblas_info = 9; RowMajorStrg = TRUE;
232+
cblas_cgemmtr( CblasRowMajor, CblasUpper, CblasNoTrans, CblasNoTrans, 0, 2,
233+
ALPHA, A, 1, B, 1, BETA, C, 2 );
234+
chkxer();
235+
cblas_info = 9; RowMajorStrg = TRUE;
236+
cblas_cgemmtr( CblasRowMajor, CblasUpper, CblasNoTrans, CblasTrans, 0, 2,
237+
ALPHA, A, 1, B, 2, BETA, C, 2 );
238+
chkxer();
239+
cblas_info = 9; RowMajorStrg = TRUE;
240+
cblas_cgemmtr( CblasRowMajor, CblasUpper, CblasTrans, CblasNoTrans, 2, 0,
241+
ALPHA, A, 1, B, 2, BETA, C, 1 );
242+
chkxer();
243+
cblas_info = 9; RowMajorStrg = TRUE;
244+
cblas_cgemmtr( CblasRowMajor, CblasUpper, CblasTrans, CblasTrans, 2, 0,
245+
ALPHA, A, 1, B, 1, BETA, C, 1 );
246+
chkxer();
247+
248+
cblas_info = 11; RowMajorStrg = TRUE;
249+
cblas_cgemmtr( CblasColMajor, CblasUpper, CblasNoTrans, CblasNoTrans, 0, 2,
250+
ALPHA, A, 1, B, 1, BETA, C, 1 );
251+
chkxer();
252+
cblas_info = 11; RowMajorStrg = TRUE;
253+
cblas_cgemmtr( CblasColMajor, CblasUpper, CblasTrans, CblasNoTrans, 0, 2,
254+
ALPHA, A, 2, B, 1, BETA, C, 1 );
255+
chkxer();
256+
cblas_info = 11; RowMajorStrg = TRUE;
257+
cblas_cgemmtr( CblasColMajor, CblasUpper, CblasTrans, CblasTrans, 2, 0,
258+
ALPHA, A, 1, B, 1, BETA, C, 1 );
259+
chkxer();
260+
261+
cblas_info = 14; RowMajorStrg = TRUE;
262+
cblas_cgemmtr( CblasRowMajor, CblasUpper, CblasNoTrans, CblasNoTrans, 2, 0,
263+
ALPHA, A, 2, B, 2, BETA, C, 1 );
264+
chkxer();
265+
cblas_info = 14; RowMajorStrg = TRUE;
266+
cblas_cgemmtr( CblasRowMajor, CblasUpper, CblasNoTrans, CblasTrans, 2, 0,
267+
ALPHA, A, 2, B, 1, BETA, C, 1 );
268+
chkxer();
269+
cblas_info = 14; RowMajorStrg = TRUE;
270+
cblas_cgemmtr( CblasRowMajor, CblasUpper, CblasTrans, CblasNoTrans, 2, 0,
271+
ALPHA, A, 2, B, 2, BETA, C, 1 );
272+
chkxer();
273+
cblas_info = 14; RowMajorStrg = TRUE;
274+
cblas_cgemmtr( CblasRowMajor, CblasUpper, CblasTrans, CblasTrans, 2, 0,
275+
ALPHA, A, 2, B, 2, BETA, C, 1 );
276+
chkxer();
277+
278+
} else if (strncmp( sf,"cblas_cgemm" ,11)==0) {
50279
cblas_rout = "cblas_cgemm" ;
51280

52281

‎ctest/c_cblat3c.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2330,7 +2330,7 @@ int /* Main program */ main(void)
23302330
if (conj) {
23312331
rbets = rbeta;
23322332
} else {
2333-
bets.r = beta.r, bets.i = beta.i;
2333+
bets.r = beta.r; bets.i = beta.i;
23342334
}
23352335
i__5 = lcc;
23362336
for (i__ = 1; i__ <= i__5; ++i__) {
@@ -2389,26 +2389,26 @@ int /* Main program */ main(void)
23892389
isame[2] = ns == n;
23902390
isame[3] = ks == k;
23912391
if (conj) {
2392-
isame[4] = rals == ralpha;
2392+
isame[4] = (rals == ralpha);
23932393
} else {
2394-
isame[4] = als.r == alpha.r && als.i ==
2395-
alpha.i;
2394+
isame[4] = (( als.r == alpha.r) && (als.i ==
2395+
alpha.i));
23962396
}
23972397
isame[5] = lce_(&as[1], &aa[1], &laa);
23982398
isame[6] = ldas == lda;
23992399
if (conj) {
24002400
isame[7] = rbets == rbeta;
24012401
} else {
2402-
isame[7] = bets.r == beta.r && bets.i ==
2403-
beta.i;
2402+
isame[7] = ((bets.r == beta.r) && (bets.i ==
2403+
beta.i));
24042404
}
24052405
if (null) {
24062406
isame[8] = lce_(&cs[1], &cc[1], &lcc);
24072407
} else {
24082408
isame[8] = lceres_(sname + 7, uplo, &n, &n, &
24092409
cs[1], &cc[1], &ldc);
24102410
}
2411-
isame[9] = ldcs == ldc;
2411+
isame[9] = (ldcs == ldc);
24122412

24132413
/* If data was incorrectly changed, report and */
24142414
/* return. */
@@ -2837,7 +2837,7 @@ int /* Main program */ main(void)
28372837
if (conj) {
28382838
rbets = rbeta;
28392839
} else {
2840-
bets.r = beta.r, bets.i = beta.i;
2840+
bets.r = beta.r; bets.i = beta.i;
28412841
}
28422842
i__5 = lcc;
28432843
for (i__ = 1; i__ <= i__5; ++i__) {

‎ctest/c_cblat3c_3m.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2261,7 +2261,7 @@ int /* Main program */ main(void)
22612261
if (conj) {
22622262
ralpha = alpha.r;
22632263
q__1.r = ralpha, q__1.i = 0.f;
2264-
alpha.r = q__1.r, alpha.i = q__1.i;
2264+
alpha.r = q__1.r; alpha.i = q__1.i;
22652265
}
22662266

22672267
i__4 = *nbet;
@@ -2297,7 +2297,7 @@ int /* Main program */ main(void)
22972297
if (conj) {
22982298
rals = ralpha;
22992299
} else {
2300-
als.r = alpha.r, als.i = alpha.i;
2300+
als.r = alpha.r; als.i = alpha.i;
23012301
}
23022302
i__5 = laa;
23032303
for (i__ = 1; i__ <= i__5; ++i__) {
@@ -2311,7 +2311,7 @@ int /* Main program */ main(void)
23112311
if (conj) {
23122312
rbets = rbeta;
23132313
} else {
2314-
bets.r = beta.r, bets.i = beta.i;
2314+
bets.r = beta.r; bets.i = beta.i;
23152315
}
23162316
i__5 = lcc;
23172317
for (i__ = 1; i__ <= i__5; ++i__) {
@@ -2378,10 +2378,10 @@ int /* Main program */ main(void)
23782378
isame[5] = lce_(&as[1], &aa[1], &laa);
23792379
isame[6] = ldas == lda;
23802380
if (conj) {
2381-
isame[7] = rbets == rbeta;
2381+
isame[7] = (rbets == rbeta);
23822382
} else {
2383-
isame[7] = bets.r == beta.r && bets.i ==
2384-
beta.i;
2383+
isame[7] = ((bets.r == beta.r) && (bets.i ==
2384+
beta.i));
23852385
}
23862386
if (null) {
23872387
isame[8] = lce_(&cs[1], &cc[1], &lcc);
@@ -2818,7 +2818,7 @@ int /* Main program */ main(void)
28182818
if (conj) {
28192819
rbets = rbeta;
28202820
} else {
2821-
bets.r = beta.r, bets.i = beta.i;
2821+
bets.r = beta.r; bets.i = beta.i;
28222822
}
28232823
i__5 = lcc;
28242824
for (i__ = 1; i__ <= i__5; ++i__) {

0 commit comments

Comments
 (0)