Skip to content

Commit af3e172

Browse files
author
Chip Kerchner
committed
Merge branch 'develop' into XLC-AIX
2 parents a69367c + 6287a23 commit af3e172

35 files changed

Lines changed: 102 additions & 94 deletions

‎.github/workflows/loongarch64.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ jobs:
1818
- target: LOONGSON2K1000
1919
triple: loongarch64-unknown-linux-gnu
2020
opts: NO_SHARED=1 TARGET=LOONGSON2K1000
21+
- target: DYNAMIC_ARCH
22+
triple: loongarch64-unknown-linux-gnu
23+
opts: NO_SHARED=1 DYNAMIC_ARCH=1 TARGET=GENERIC
2124

2225
steps:
2326
- name: Checkout repository

‎Makefile.system‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1168,7 +1168,7 @@ endif
11681168
ifeq ($(F_COMPILER), IBM)
11691169
CCOMMON_OPT += -DF_INTERFACE_IBM
11701170
FEXTRALIB += -lxlf90
1171-
ifeq ($(C_COMPILER), GCC)
1171+
ifeq ($(C_COMPILER), $(filter $(C_COMPILER),GCC CLANG))
11721172
FCOMMON_OPT += -qextname
11731173
else ifeq ($(C_COMPILER), CLANG)
11741174
FCOMMON_OPT += -qextname

‎common_thread.h‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -192,27 +192,27 @@ int exec_blas(BLASLONG num_cpu, blas_param_t *param, void *buffer);
192192
int blas_level1_thread(int mode, BLASLONG m, BLASLONG n, BLASLONG k, void *alpha,
193193
void *a, BLASLONG lda,
194194
void *b, BLASLONG ldb,
195-
void *c, BLASLONG ldc, int (*function)(), int threads);
195+
void *c, BLASLONG ldc, int (*function)(void), int threads);
196196

197-
int gemm_thread_m (int mode, blas_arg_t *, BLASLONG *, BLASLONG *, int (*function)(), void *, void *, BLASLONG);
197+
int gemm_thread_m (int mode, blas_arg_t *, BLASLONG *, BLASLONG *, int (*function)(blas_arg_t*, BLASLONG*, BLASLONG*,FLOAT *, FLOAT *, BLASLONG ), void *, void *, BLASLONG);
198198

199-
int gemm_thread_n (int mode, blas_arg_t *, BLASLONG *, BLASLONG *, int (*function)(), void *, void *, BLASLONG);
199+
int gemm_thread_n (int mode, blas_arg_t *, BLASLONG *, BLASLONG *, int (*function)(blas_arg_t*, BLASLONG*, BLASLONG*,FLOAT*, FLOAT*, BLASLONG), void *, void *, BLASLONG);
200200

201-
int gemm_thread_mn(int mode, blas_arg_t *, BLASLONG *, BLASLONG *, int (*function)(), void *, void *, BLASLONG);
201+
int gemm_thread_mn(int mode, blas_arg_t *, BLASLONG *, BLASLONG *, int (*function)(blas_arg_t*, BLASLONG*, BLASLONG*,FLOAT *, FLOAT *, BLASLONG), void *, void *, BLASLONG);
202202

203-
int gemm_thread_variable(int mode, blas_arg_t *, BLASLONG *, BLASLONG *, int (*function)(), void *, void *, BLASLONG, BLASLONG);
203+
int gemm_thread_variable(int mode, blas_arg_t *, BLASLONG *, BLASLONG *, int (*function)(blas_arg_t*, BLASLONG*, BLASLONG*,FLOAT *, FLOAT *, BLASLONG), void *, void *, BLASLONG, BLASLONG);
204204

205205
int trsm_thread(int mode, BLASLONG m, BLASLONG n,
206206
double alpha_r, double alpha_i,
207207
void *a, BLASLONG lda,
208-
void *c, BLASLONG ldc, int (*function)(), void *buffer);
208+
void *c, BLASLONG ldc, int (*function)(void), void *buffer);
209209

210-
int syrk_thread(int mode, blas_arg_t *, BLASLONG *, BLASLONG *, int (*function)(), void *, void *, BLASLONG);
210+
int syrk_thread(int mode, blas_arg_t *, BLASLONG *, BLASLONG *, int (*function)(blas_arg_t*, BLASLONG*, BLASLONG*, FLOAT *, FLOAT *, BLASLONG), void*, void*, BLASLONG);
211211

212212
int getrf_thread(int mode, BLASLONG m, BLASLONG n, BLASLONG k,
213213
void *offsetA, BLASLONG lda,
214214
void *offsetB, BLASLONG jb,
215-
void *ipiv, BLASLONG offset, int (*function)(), void *buffer);
215+
void *ipiv, BLASLONG offset, int (*function)(void), void *buffer);
216216

217217
#endif /* ENDIF ASSEMBLER */
218218

‎cpuid_x86.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ static C_INLINE void xgetbv(int op, int * eax, int * edx){
194194
}
195195
#endif
196196

197-
int support_avx(){
197+
int support_avx(void){
198198
#ifndef NO_AVX
199199
int eax, ebx, ecx, edx;
200200
int ret=0;
@@ -212,7 +212,7 @@ int support_avx(){
212212
#endif
213213
}
214214

215-
int support_avx2(){
215+
int support_avx2(void){
216216
#ifndef NO_AVX2
217217
int eax, ebx, ecx=0, edx;
218218
int ret=0;
@@ -228,7 +228,7 @@ int support_avx2(){
228228
#endif
229229
}
230230

231-
int support_avx512(){
231+
int support_avx512(void){
232232
#if !defined(NO_AVX) && !defined(NO_AVX512)
233233
int eax, ebx, ecx, edx;
234234
int ret=0;
@@ -250,7 +250,7 @@ int support_avx512(){
250250
#endif
251251
}
252252

253-
int support_avx512_bf16(){
253+
int support_avx512_bf16(void){
254254
#if !defined(NO_AVX) && !defined(NO_AVX512)
255255
int eax, ebx, ecx, edx;
256256
int ret=0;
@@ -271,7 +271,7 @@ int support_avx512_bf16(){
271271
#define BIT_AMX_BF16 0x00400000
272272
#define BIT_AMX_ENBD 0x00060000
273273

274-
int support_amx_bf16() {
274+
int support_amx_bf16(void) {
275275
#if !defined(NO_AVX) && !defined(NO_AVX512)
276276
int eax, ebx, ecx, edx;
277277
int ret=0;

‎driver/level3/gemm_thread_m.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
#include <stdlib.h>
4141
#include "common.h"
4242

43-
int CNAME(int mode, blas_arg_t *arg, BLASLONG *range_m, BLASLONG *range_n, int (*function)(), void *sa, void *sb, BLASLONG nthreads) {
43+
int CNAME(int mode, blas_arg_t *arg, BLASLONG *range_m, BLASLONG *range_n, int (*function)(blas_arg_t*, BLASLONG*, BLASLONG*,FLOAT *, FLOAT *, BLASLONG ), void *sa, void *sb, BLASLONG nthreads) {
4444

4545
blas_queue_t queue[MAX_CPU_NUMBER];
4646
BLASLONG range[MAX_CPU_NUMBER + 1];

‎driver/level3/gemm_thread_mn.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ static const int divide_rule[][2] =
6060
{ 1, 61}, { 2, 31}, { 7, 9}, { 8, 8},
6161
};
6262

63-
int CNAME(int mode, blas_arg_t *arg, BLASLONG *range_m, BLASLONG *range_n, int (*function)(), void *sa, void *sb, BLASLONG nthreads) {
63+
int CNAME(int mode, blas_arg_t *arg, BLASLONG *range_m, BLASLONG *range_n, int (*function)(blas_arg_t*, BLASLONG*, BLASLONG*,FLOAT *, FLOAT *, BLASLONG ), void *sa, void *sb, BLASLONG nthreads) {
6464

6565
blas_queue_t queue[MAX_CPU_NUMBER];
6666

‎driver/level3/gemm_thread_n.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
#include <stdlib.h>
4141
#include "common.h"
4242

43-
int CNAME(int mode, blas_arg_t *arg, BLASLONG *range_m, BLASLONG *range_n, int (*function)(), void *sa, void *sb, BLASLONG nthreads) {
43+
int CNAME(int mode, blas_arg_t *arg, BLASLONG *range_m, BLASLONG *range_n, int (*function)(blas_arg_t*, BLASLONG*, BLASLONG*,FLOAT *, FLOAT *, BLASLONG), void *sa, void *sb, BLASLONG nthreads) {
4444

4545
blas_queue_t queue[MAX_CPU_NUMBER];
4646
BLASLONG range[MAX_CPU_NUMBER + 1];

‎driver/level3/gemm_thread_variable.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242

4343
int CNAME(int mode,
4444
blas_arg_t *arg, BLASLONG *range_m, BLASLONG *range_n,
45-
int (*function)(), void *sa, void *sb, BLASLONG divM, BLASLONG divN) {
45+
int (*function)(blas_arg_t*, BLASLONG*, BLASLONG*,FLOAT *, FLOAT *, BLASLONG ), void *sa, void *sb, BLASLONG divM, BLASLONG divN) {
4646

4747
blas_queue_t queue[MAX_CPU_NUMBER];
4848

‎driver/level3/syrk_thread.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
#include <math.h>
4242
#include "common.h"
4343

44-
int CNAME(int mode, blas_arg_t *arg, BLASLONG *range_m, BLASLONG *range_n, int (*function)(), void *sa, void *sb, BLASLONG nthreads) {
44+
int CNAME(int mode, blas_arg_t *arg, BLASLONG *range_m, BLASLONG *range_n, int (*function)(blas_arg_t*, BLASLONG*, BLASLONG*, FLOAT *, FLOAT *, BLASLONG), void *sa, void *sb, BLASLONG nthreads) {
4545

4646
blas_queue_t queue[MAX_CPU_NUMBER];
4747
BLASLONG range[MAX_CPU_NUMBER + 1];

‎driver/others/blas_l1_thread.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
int blas_level1_thread(int mode, BLASLONG m, BLASLONG n, BLASLONG k, void *alpha,
4444
void *a, BLASLONG lda,
4545
void *b, BLASLONG ldb,
46-
void *c, BLASLONG ldc, int (*function)(), int nthreads){
46+
void *c, BLASLONG ldc, int (*function)(void), int nthreads){
4747

4848
blas_queue_t queue[MAX_CPU_NUMBER];
4949
blas_arg_t args [MAX_CPU_NUMBER];
@@ -141,7 +141,7 @@ int blas_level1_thread(int mode, BLASLONG m, BLASLONG n, BLASLONG k, void *alpha
141141
int blas_level1_thread_with_return_value(int mode, BLASLONG m, BLASLONG n, BLASLONG k, void *alpha,
142142
void *a, BLASLONG lda,
143143
void *b, BLASLONG ldb,
144-
void *c, BLASLONG ldc, int (*function)(), int nthreads){
144+
void *c, BLASLONG ldc, int (*function)(void), int nthreads){
145145

146146
blas_queue_t queue[MAX_CPU_NUMBER];
147147
blas_arg_t args [MAX_CPU_NUMBER];

0 commit comments

Comments
 (0)