Skip to content

Commit 624e9d1

Browse files
authored
Merge pull request #4916 from martin-frbg/issue4901
Fix SIGILL/SIGSEGV in PPCG4 SGEMM and fix NAN handling in PPCG4 SSCAL/DSCAL
2 parents 54afc24 + d714013 commit 624e9d1

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

kernel/power/KERNEL.PPCG4

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,13 @@ DSCALKERNEL = scal_ppc440.S
7070
CSCALKERNEL = zscal_ppc440.S
7171
ZSCALKERNEL = zscal_ppc440.S
7272

73-
SGEMMKERNEL = gemm_kernel_altivec_g4.S
74-
SGEMMINCOPY = ../generic/gemm_ncopy_16.c
75-
SGEMMITCOPY = ../generic/gemm_tcopy_16.c
73+
SGEMMKERNEL = gemm_kernel_g4.S
74+
SGEMMINCOPY =
75+
SGEMMITCOPY =
7676
SGEMMONCOPY = gemm_ncopy_4.S
7777
SGEMMOTCOPY = gemm_tcopy_4.S
78-
SGEMMINCOPYOBJ = sgemm_incopy$(TSUFFIX).$(SUFFIX)
79-
SGEMMITCOPYOBJ = sgemm_itcopy$(TSUFFIX).$(SUFFIX)
78+
SGEMMINCOPYOBJ =
79+
SGEMMITCOPYOBJ =
8080
SGEMMONCOPYOBJ = sgemm_oncopy$(TSUFFIX).$(SUFFIX)
8181
SGEMMOTCOPYOBJ = sgemm_otcopy$(TSUFFIX).$(SUFFIX)
8282
DGEMMKERNEL = gemm_kernel_g4.S

param.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2243,7 +2243,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
22432243
#define GEMM_DEFAULT_OFFSET_B 1024
22442244
#define GEMM_DEFAULT_ALIGN 0x0ffffUL
22452245

2246-
#define SGEMM_DEFAULT_UNROLL_M 16
2246+
#define SGEMM_DEFAULT_UNROLL_M 4
22472247
#define SGEMM_DEFAULT_UNROLL_N 4
22482248
#define DGEMM_DEFAULT_UNROLL_M 4
22492249
#define DGEMM_DEFAULT_UNROLL_N 4

0 commit comments

Comments
 (0)