Skip to content

Commit 5edd88c

Browse files
authored
Merge pull request #3384 from martin-frbg/issue3383
Modify ARMV8 kernels to leave x18 unused as it is reserved on OSX
2 parents d3a9c7e + 90cc944 commit 5edd88c

File tree

6 files changed

+11
-10
lines changed

6 files changed

+11
-10
lines changed

kernel/arm64/dgemm_tcopy_8.S

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,10 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
5050
#define B03 x16
5151
#define B04 x17
5252

53-
#define I x18
54-
#define J x19
53+
#define I x19
54+
#define J x20
5555

56-
#define TEMP1 x20
57-
#define TEMP2 x21
56+
#define TEMP1 x21
5857

5958
#define A_PREFETCH 2560
6059
#define B_PREFETCH 256

kernel/arm64/dtrmm_kernel_8x4.S

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,10 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
4949
#define pCRow3 x15
5050
#define pA x16
5151
#define alpha x17
52-
#define temp x18
52+
//#define temp x18
5353
#define tempOffset x19
5454
#define tempK x20
55+
#define temp x21
5556

5657
#define alpha0 d10
5758
#define alphaV0 v10.d[0]

kernel/arm64/sgemm_tcopy_16.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ All rights reserved.
3030
#define B00 x22
3131

3232

33-
#define I x18
33+
#define I x21
3434
#define J x19
3535

3636
#define TEMP1 x20

kernel/arm64/strmm_kernel_16x4.S

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,10 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
4949
#define pCRow3 x15
5050
#define pA x16
5151
#define alpha w17
52-
#define temp x18
52+
//#define temp x18
5353
#define tempOffset x19
5454
#define tempK x20
55+
#define temp x21
5556

5657
#define alpha0 s10
5758
#define alphaV0 v10.s[0]

kernel/arm64/zgemm_kernel_4x4.S

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
4848
#define pCRow2 x14
4949
#define pCRow3 x15
5050
#define pA x16
51-
#define alphaR x17
52-
#define alphaI x18
51+
#define alphaR x19
52+
#define alphaI x20
5353

5454
#define alpha0_R d10
5555
#define alphaV0_R v10.d[0]

kernel/arm64/ztrmm_kernel_4x4.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
4949
#define pCRow3 x15
5050
#define pA x16
5151
#define alphaR x17
52-
#define alphaI x18
52+
#define alphaI x22
5353
#define temp x19
5454
#define tempOffset x20
5555
#define tempK x21

0 commit comments

Comments
 (0)