Skip to content

Commit dc6e44c

Browse files
authored
Merge pull request #2916 from martin-frbg/issue2911
Clean up duplicate definitions in POWER8 kernels and fix power10 option passing
2 parents 5b9ebe4 + fe2a922 commit dc6e44c

File tree

6 files changed

+1
-8
lines changed

6 files changed

+1
-8
lines changed

Makefile.power

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ USE_OPENMP = 1
1010
endif
1111

1212
ifeq ($(CORE), POWER10)
13-
COMMON_OPT += -Ofast -mcpu=power10 -mtune=power10 -mvsx -fno-fast-math
13+
CCOMMON_OPT += -Ofast -mcpu=power10 -mtune=power10 -mvsx -fno-fast-math
1414
FCOMMON_OPT += -O2 -frecursive -mcpu=power10 -mtune=power10 -fno-fast-math
1515
endif
1616

kernel/power/ctrmm_kernel_8x4_power8.S

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,12 +82,10 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
8282
#endif
8383

8484
#ifdef __64BIT__
85-
#define STACKSIZE 400
8685
#define STACKSIZE 592
8786
#define ALPHA_R_SP 304+192(SP)
8887
#define ALPHA_I_SP 312+192(SP)
8988
#else
90-
#define STACKSIZE 256
9189
#define STACKSIZE 452
9290
#define ALPHA_R_SP 224+196(SP)
9391
#define ALPHA_I_SP 232+196(SP)

kernel/power/dgemm_kernel_16x4_power8.S

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,12 +82,10 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
8282
#endif
8383

8484
#ifdef __64BIT__
85-
#define STACKSIZE 320
8685
#define STACKSIZE 512
8786
#define ALPHA_SP 296+192(SP)
8887
#define FZERO 304+192(SP)
8988
#else
90-
#define STACKSIZE 240
9189
#define STACKSIZE 440
9290
#define ALPHA_SP 224+200(SP)
9391
#define FZERO 232+200(SP)

kernel/power/dtrmm_kernel_16x4_power8.S

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
8282
#endif
8383

8484
#ifdef __64BIT__
85-
#define STACKSIZE 320
8685
#define STACKSIZE 520
8786
#define ALPHA_SP 296+200(SP)
8887
#define FZERO 304+200(SP)

kernel/power/dtrsm_kernel_LT_16x4_power8.S

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@
4747
#endif
4848

4949
#ifdef __64BIT__
50-
#define STACKSIZE 320
5150
#define STACKSIZE 520
5251
#define ALPHA 296+200(SP)
5352
#define FZERO 304+200(SP)

kernel/power/strmm_kernel_16x8_power8.S

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
8282
#endif
8383

8484
#ifdef __64BIT__
85-
#define STACKSIZE 340
8685
#define STACKSIZE 540
8786
#define ALPHA_SP 296+200(SP)
8887
#define FZERO 304+200(SP)

0 commit comments

Comments
 (0)