Skip to content

Commit 68ff451

Browse files
authored
Merge pull request #5558 from ErnstPeng/fix-LA
Fix floating point registers ld/st bug of Loongarch
2 parents d6b25c4 + f6533cc commit 68ff451

File tree

8 files changed

+138
-138
lines changed

8 files changed

+138
-138
lines changed

kernel/loongarch64/cgemm_kernel_2x2_lasx.S

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -212,15 +212,15 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
212212
SDARG $r25, $sp, 16
213213
SDARG $r26, $sp, 24
214214
SDARG $r27, $sp, 32
215-
ST $f23, $sp, 40
216-
ST $f24, $sp, 48
217-
ST $f25, $sp, 56
218-
ST $f26, $sp, 64
219-
ST $f27, $sp, 72
220-
ST $f28, $sp, 80
221-
ST $f29, $sp, 88
222-
ST $f30, $sp, 96
223-
ST $f31, $sp, 104
215+
fst.d $f23, $sp, 40
216+
fst.d $f24, $sp, 48
217+
fst.d $f25, $sp, 56
218+
fst.d $f26, $sp, 64
219+
fst.d $f27, $sp, 72
220+
fst.d $f28, $sp, 80
221+
fst.d $f29, $sp, 88
222+
fst.d $f30, $sp, 96
223+
fst.d $f31, $sp, 104
224224
ST ALPHA_R,$sp, 112
225225
ST ALPHA_I,$sp, 120
226226

@@ -841,15 +841,15 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
841841
LDARG $r25, $sp, 16
842842
LDARG $r26, $sp, 24
843843
LDARG $r27, $sp, 32
844-
LD $f23, $sp, 40
845-
LD $f24, $sp, 48
846-
LD $f25, $sp, 56
847-
LD $f26, $sp, 64
848-
LD $f27, $sp, 72
849-
LD $f28, $sp, 80
850-
LD $f29, $sp, 88
851-
LD $f30, $sp, 96
852-
LD $f31, $sp, 104
844+
fld.d $f23, $sp, 40
845+
fld.d $f24, $sp, 48
846+
fld.d $f25, $sp, 56
847+
fld.d $f26, $sp, 64
848+
fld.d $f27, $sp, 72
849+
fld.d $f28, $sp, 80
850+
fld.d $f29, $sp, 88
851+
fld.d $f30, $sp, 96
852+
fld.d $f31, $sp, 104
853853

854854
addi.d $sp, $sp, 128
855855
jirl $r0, $r1, 0x0

kernel/loongarch64/cgemm_kernel_2x2_lsx.S

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -172,15 +172,15 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
172172
SDARG $r25, $sp, 16
173173
SDARG $r26, $sp, 24
174174
SDARG $r27, $sp, 32
175-
ST $f23, $sp, 40
176-
ST $f24, $sp, 48
177-
ST $f25, $sp, 56
178-
ST $f26, $sp, 64
179-
ST $f27, $sp, 72
180-
ST $f28, $sp, 80
181-
ST $f29, $sp, 88
182-
ST $f30, $sp, 96
183-
ST $f31, $sp, 104
175+
fst.d $f23, $sp, 40
176+
fst.d $f24, $sp, 48
177+
fst.d $f25, $sp, 56
178+
fst.d $f26, $sp, 64
179+
fst.d $f27, $sp, 72
180+
fst.d $f28, $sp, 80
181+
fst.d $f29, $sp, 88
182+
fst.d $f30, $sp, 96
183+
fst.d $f31, $sp, 104
184184
ST ALPHA_R,$sp, 112
185185
ST ALPHA_I,$sp, 120
186186

@@ -796,15 +796,15 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
796796
LDARG $r25, $sp, 16
797797
LDARG $r26, $sp, 24
798798
LDARG $r27, $sp, 32
799-
LD $f23, $sp, 40
800-
LD $f24, $sp, 48
801-
LD $f25, $sp, 56
802-
LD $f26, $sp, 64
803-
LD $f27, $sp, 72
804-
LD $f28, $sp, 80
805-
LD $f29, $sp, 88
806-
LD $f30, $sp, 96
807-
LD $f31, $sp, 104
799+
fld.d $f23, $sp, 40
800+
fld.d $f24, $sp, 48
801+
fld.d $f25, $sp, 56
802+
fld.d $f26, $sp, 64
803+
fld.d $f27, $sp, 72
804+
fld.d $f28, $sp, 80
805+
fld.d $f29, $sp, 88
806+
fld.d $f30, $sp, 96
807+
fld.d $f31, $sp, 104
808808

809809
addi.d $sp, $sp, 128
810810
jirl $r0, $r1, 0x0

kernel/loongarch64/cgemm_kernel_8x4_lsx.S

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -176,15 +176,15 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
176176
SDARG $r25, $sp, 16
177177
SDARG $r26, $sp, 24
178178
SDARG $r27, $sp, 32
179-
ST $f23, $sp, 40
180-
ST $f24, $sp, 48
181-
ST $f25, $sp, 56
182-
ST $f26, $sp, 64
183-
ST $f27, $sp, 72
184-
ST $f28, $sp, 80
185-
ST $f29, $sp, 88
186-
ST $f30, $sp, 96
187-
ST $f31, $sp, 104
179+
fst.d $f23, $sp, 40
180+
fst.d $f24, $sp, 48
181+
fst.d $f25, $sp, 56
182+
fst.d $f26, $sp, 64
183+
fst.d $f27, $sp, 72
184+
fst.d $f28, $sp, 80
185+
fst.d $f29, $sp, 88
186+
fst.d $f30, $sp, 96
187+
fst.d $f31, $sp, 104
188188
ST ALPHA_R,$sp, 112
189189
ST ALPHA_I,$sp, 120
190190

@@ -3297,15 +3297,15 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
32973297
LDARG $r25, $sp, 16
32983298
LDARG $r26, $sp, 24
32993299
LDARG $r27, $sp, 32
3300-
LD $f23, $sp, 40
3301-
LD $f24, $sp, 48
3302-
LD $f25, $sp, 56
3303-
LD $f26, $sp, 64
3304-
LD $f27, $sp, 72
3305-
LD $f28, $sp, 80
3306-
LD $f29, $sp, 88
3307-
LD $f30, $sp, 96
3308-
LD $f31, $sp, 104
3300+
fld.d $f23, $sp, 40
3301+
fld.d $f24, $sp, 48
3302+
fld.d $f25, $sp, 56
3303+
fld.d $f26, $sp, 64
3304+
fld.d $f27, $sp, 72
3305+
fld.d $f28, $sp, 80
3306+
fld.d $f29, $sp, 88
3307+
fld.d $f30, $sp, 96
3308+
fld.d $f31, $sp, 104
33093309

33103310
addi.d $sp, $sp, 128
33113311
jirl $r0, $r1, 0x0

kernel/loongarch64/dgemm_kernel_8x4.S

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -893,14 +893,14 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
893893
SDARG $r25, $sp, 16
894894
SDARG $r26, $sp, 24
895895
SDARG $r27, $sp, 32
896-
ST $f24, $sp, 40
897-
ST $f25, $sp, 48
898-
ST $f26, $sp, 56
899-
ST $f27, $sp, 64
900-
ST $f28, $sp, 72
901-
ST $f29, $sp, 80
902-
ST $f30, $sp, 88
903-
ST $f31, $sp, 96
896+
fst.d $f24, $sp, 40
897+
fst.d $f25, $sp, 48
898+
fst.d $f26, $sp, 56
899+
fst.d $f27, $sp, 64
900+
fst.d $f28, $sp, 72
901+
fst.d $f29, $sp, 80
902+
fst.d $f30, $sp, 88
903+
fst.d $f31, $sp, 96
904904
ST ALPHA, $sp, 104
905905

906906
#if defined (TRMMKERNEL) && !defined(LEFT)
@@ -2879,14 +2879,14 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28792879
LDARG $r25, $sp, 16
28802880
LDARG $r26, $sp, 24
28812881
LDARG $r27, $sp, 32
2882-
LD $f24, $sp, 40
2883-
LD $f25, $sp, 48
2884-
LD $f26, $sp, 56
2885-
LD $f27, $sp, 64
2886-
LD $f28, $sp, 72
2887-
LD $f29, $sp, 80
2888-
LD $f30, $sp, 88
2889-
LD $f31, $sp, 96
2882+
fld.d $f24, $sp, 40
2883+
fld.d $f25, $sp, 48
2884+
fld.d $f26, $sp, 56
2885+
fld.d $f27, $sp, 64
2886+
fld.d $f28, $sp, 72
2887+
fld.d $f29, $sp, 80
2888+
fld.d $f30, $sp, 88
2889+
fld.d $f31, $sp, 96
28902890
addi.d $sp, $sp, 112
28912891

28922892
jirl $r0, $r1, 0x0

kernel/loongarch64/dgemm_ncopy_16.S

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -113,15 +113,15 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
113113
SDARG $r29, $sp, 0x30
114114
SDARG $r30, $sp, 0x38
115115
SDARG $r31, $sp, 0x40
116-
ST $f23, $sp, 0x48
117-
ST $f24, $sp, 0x50
118-
ST $f25, $sp, 0x58
119-
ST $f26, $sp, 0x60
120-
ST $f27, $sp, 0x68
121-
ST $f28, $sp, 0x70
122-
ST $f29, $sp, 0x78
123-
ST $f30, $sp, 0x80
124-
ST $f31, $sp, 0x88
116+
fst.d $f23, $sp, 0x48
117+
fst.d $f24, $sp, 0x50
118+
fst.d $f25, $sp, 0x58
119+
fst.d $f26, $sp, 0x60
120+
fst.d $f27, $sp, 0x68
121+
fst.d $f28, $sp, 0x70
122+
fst.d $f29, $sp, 0x78
123+
fst.d $f30, $sp, 0x80
124+
fst.d $f31, $sp, 0x88
125125

126126
move TD, DST
127127
move TS, SRC
@@ -678,15 +678,15 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
678678
LDARG $r29, $sp, 0x30
679679
LDARG $r30, $sp, 0x38
680680
LDARG $r31, $sp, 0x40
681-
LD $f23, $sp, 0x48
682-
LD $f24, $sp, 0x50
683-
LD $f25, $sp, 0x58
684-
LD $f26, $sp, 0x60
685-
LD $f27, $sp, 0x68
686-
LD $f28, $sp, 0x70
687-
LD $f29, $sp, 0x78
688-
LD $f30, $sp, 0x80
689-
LD $f31, $sp, 0x88
681+
fld.d $f23, $sp, 0x48
682+
fld.d $f24, $sp, 0x50
683+
fld.d $f25, $sp, 0x58
684+
fld.d $f26, $sp, 0x60
685+
fld.d $f27, $sp, 0x68
686+
fld.d $f28, $sp, 0x70
687+
fld.d $f29, $sp, 0x78
688+
fld.d $f30, $sp, 0x80
689+
fld.d $f31, $sp, 0x88
690690
addi.d $sp, $sp, 0x90
691691
jirl $r0, $r1, 0x00
692692

kernel/loongarch64/zgemm_kernel_2x2.S

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -123,13 +123,13 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
123123
SDARG $r24, $sp, 8
124124
SDARG $r25, $sp, 16
125125
SDARG $r26, $sp, 24
126-
ST $f23, $sp, 32
127-
ST $f24, $sp, 40
128-
ST $f25, $sp, 48
129-
ST $f26, $sp, 56
130-
ST $f27, $sp, 64
131-
ST $f28, $sp, 72
132-
ST $f29, $sp, 80
126+
fst.d $f23, $sp, 32
127+
fst.d $f24, $sp, 40
128+
fst.d $f25, $sp, 48
129+
fst.d $f26, $sp, 56
130+
fst.d $f27, $sp, 64
131+
fst.d $f28, $sp, 72
132+
fst.d $f29, $sp, 80
133133

134134

135135
#if defined (TRMMKERNEL) && !defined(LEFT)
@@ -834,13 +834,13 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
834834
LDARG $r24, $sp, 8
835835
LDARG $r25, $sp, 16
836836
LDARG $r26, $sp, 24
837-
LD $f23, $sp, 32
838-
LD $f24, $sp, 40
839-
LD $f25, $sp, 48
840-
LD $f26, $sp, 56
841-
LD $f27, $sp, 64
842-
LD $f28, $sp, 72
843-
LD $f29, $sp, 80
837+
fld.d $f23, $sp, 32
838+
fld.d $f24, $sp, 40
839+
fld.d $f25, $sp, 48
840+
fld.d $f26, $sp, 56
841+
fld.d $f27, $sp, 64
842+
fld.d $f28, $sp, 72
843+
fld.d $f29, $sp, 80
844844

845845
addi.d $sp, $sp, 88
846846
jirl $r0, $r1, 0x0

kernel/loongarch64/zgemm_kernel_2x2_lasx.S

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -174,15 +174,15 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
174174
SDARG $r25, $sp, 16
175175
SDARG $r26, $sp, 24
176176
SDARG $r27, $sp, 32
177-
ST $f23, $sp, 40
178-
ST $f24, $sp, 48
179-
ST $f25, $sp, 56
180-
ST $f26, $sp, 64
181-
ST $f27, $sp, 72
182-
ST $f28, $sp, 80
183-
ST $f29, $sp, 88
184-
ST $f30, $sp, 96
185-
ST $f31, $sp, 104
177+
fst.d $f23, $sp, 40
178+
fst.d $f24, $sp, 48
179+
fst.d $f25, $sp, 56
180+
fst.d $f26, $sp, 64
181+
fst.d $f27, $sp, 72
182+
fst.d $f28, $sp, 80
183+
fst.d $f29, $sp, 88
184+
fst.d $f30, $sp, 96
185+
fst.d $f31, $sp, 104
186186
ST ALPHA_R,$sp, 112
187187
ST ALPHA_I,$sp, 120
188188

@@ -806,15 +806,15 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
806806
LDARG $r25, $sp, 16
807807
LDARG $r26, $sp, 24
808808
LDARG $r27, $sp, 32
809-
LD $f23, $sp, 40
810-
LD $f24, $sp, 48
811-
LD $f25, $sp, 56
812-
LD $f26, $sp, 64
813-
LD $f27, $sp, 72
814-
LD $f28, $sp, 80
815-
LD $f29, $sp, 88
816-
LD $f30, $sp, 96
817-
LD $f31, $sp, 104
809+
fld.d $f23, $sp, 40
810+
fld.d $f24, $sp, 48
811+
fld.d $f25, $sp, 56
812+
fld.d $f26, $sp, 64
813+
fld.d $f27, $sp, 72
814+
fld.d $f28, $sp, 80
815+
fld.d $f29, $sp, 88
816+
fld.d $f30, $sp, 96
817+
fld.d $f31, $sp, 104
818818

819819
addi.d $sp, $sp, 128
820820
jirl $r0, $r1, 0x0

kernel/loongarch64/zgemm_kernel_4x4_lsx.S

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -176,15 +176,15 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
176176
SDARG $r25, $sp, 16
177177
SDARG $r26, $sp, 24
178178
SDARG $r27, $sp, 32
179-
ST $f23, $sp, 40
180-
ST $f24, $sp, 48
181-
ST $f25, $sp, 56
182-
ST $f26, $sp, 64
183-
ST $f27, $sp, 72
184-
ST $f28, $sp, 80
185-
ST $f29, $sp, 88
186-
ST $f30, $sp, 96
187-
ST $f31, $sp, 104
179+
fst.d $f23, $sp, 40
180+
fst.d $f24, $sp, 48
181+
fst.d $f25, $sp, 56
182+
fst.d $f26, $sp, 64
183+
fst.d $f27, $sp, 72
184+
fst.d $f28, $sp, 80
185+
fst.d $f29, $sp, 88
186+
fst.d $f30, $sp, 96
187+
fst.d $f31, $sp, 104
188188
ST ALPHA_R,$sp, 112
189189
ST ALPHA_I,$sp, 120
190190

@@ -2300,15 +2300,15 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
23002300
LDARG $r25, $sp, 16
23012301
LDARG $r26, $sp, 24
23022302
LDARG $r27, $sp, 32
2303-
LD $f23, $sp, 40
2304-
LD $f24, $sp, 48
2305-
LD $f25, $sp, 56
2306-
LD $f26, $sp, 64
2307-
LD $f27, $sp, 72
2308-
LD $f28, $sp, 80
2309-
LD $f29, $sp, 88
2310-
LD $f30, $sp, 96
2311-
LD $f31, $sp, 104
2303+
fld.d $f23, $sp, 40
2304+
fld.d $f24, $sp, 48
2305+
fld.d $f25, $sp, 56
2306+
fld.d $f26, $sp, 64
2307+
fld.d $f27, $sp, 72
2308+
fld.d $f28, $sp, 80
2309+
fld.d $f29, $sp, 88
2310+
fld.d $f30, $sp, 96
2311+
fld.d $f31, $sp, 104
23122312

23132313
addi.d $sp, $sp, 128
23142314
jirl $r0, $r1, 0x0

0 commit comments

Comments
 (0)