Skip to content

Commit 544b069

Browse files
martin-frbgmartin-frbg
authored
Merge pull request #1780 from martin-frbg/issue1774-2
Convert fldmia/fstmia instructions to UAL syntax for clang7
2 parents 10ce707 + 9b2a7ad commit 544b069

8 files changed

+44
-44
lines changed

‎kernel/arm/cgemm_ncopy_2_vfp.S

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
8585
flds s6 , [ AO2, #8 ]
8686
flds s7 , [ AO2, #12 ]
8787

88-
fstmias BO!, { s0 - s7 }
88+
vstmia.f32 BO!, { s0 - s7 }
8989
add AO2, AO2, #16
9090

9191
.endm
@@ -99,7 +99,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
9999
flds s3 , [ AO2, #4 ]
100100

101101
add AO1, AO1, #8
102-
fstmias BO!, { s0 - s3 }
102+
vstmia.f32 BO!, { s0 - s3 }
103103
add AO2, AO2, #8
104104

105105
.endm
@@ -111,7 +111,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
111111
flds s2 , [ AO1, #8 ]
112112
flds s3 , [ AO1, #12 ]
113113

114-
fstmias BO!, { s0 - s3 }
114+
vstmia.f32 BO!, { s0 - s3 }
115115
add AO1, AO1, #16
116116

117117
.endm
@@ -122,7 +122,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
122122
flds s0 , [ AO1, #0 ]
123123
flds s1 , [ AO1, #4 ]
124124

125-
fstmias BO!, { s0 - s1 }
125+
vstmia.f32 BO!, { s0 - s1 }
126126
add AO1, AO1, #8
127127

128128
.endm

‎kernel/arm/dgemm_ncopy_2_vfp.S

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
7373
fldd d3 , [ AO2, #8 ]
7474

7575
add AO1, AO1, #16
76-
fstmiad BO!, { d0 - d3 }
76+
vstmia.f64 BO!, { d0 - d3 }
7777
add AO2, AO2, #16
7878

7979
.endm
@@ -85,7 +85,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
8585
fldd d1 , [ AO2, #0 ]
8686
add AO1, AO1, #8
8787

88-
fstmiad BO!, { d0 - d1 }
88+
vstmia.f64 BO!, { d0 - d1 }
8989
add AO2, AO2, #8
9090

9191
.endm
@@ -95,7 +95,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
9595
fldd d0 , [ AO1, #0 ]
9696
fldd d1 , [ AO1, #8 ]
9797

98-
fstmiad BO!, { d0 - d1 }
98+
vstmia.f64 BO!, { d0 - d1 }
9999
add AO1, AO1, #16
100100

101101
.endm
@@ -105,7 +105,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
105105

106106
fldd d0 , [ AO1, #0 ]
107107

108-
fstmiad BO!, { d0 }
108+
vstmia.f64 BO!, { d0 }
109109
add AO1, AO1, #8
110110

111111
.endm

‎kernel/arm/dgemm_ncopy_4_vfp.S

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -105,10 +105,10 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
105105
fldd d11, [ AO4, #16 ]
106106
fldd d15, [ AO4, #24 ]
107107

108-
fstmiad BO!, { d0 - d3 }
108+
vstmia.f64 BO!, { d0 - d3 }
109109
add AO4, AO4, #32
110-
fstmiad BO!, { d4 - d7 }
111-
fstmiad BO!, { d8 - d15 }
110+
vstmia.f64 BO!, { d4 - d7 }
111+
vstmia.f64 BO!, { d8 - d15 }
112112

113113
.endm
114114

@@ -122,7 +122,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
122122
fldd d3 , [ AO4, #0 ]
123123

124124
add AO3, AO3, #8
125-
fstmiad BO!, { d0 - d3 }
125+
vstmia.f64 BO!, { d0 - d3 }
126126
add AO4, AO4, #8
127127

128128
.endm
@@ -140,7 +140,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
140140
fldd d5 , [ AO2, #16 ]
141141
fldd d7 , [ AO2, #24 ]
142142

143-
fstmiad BO!, { d0 - d7 }
143+
vstmia.f64 BO!, { d0 - d7 }
144144
add AO2, AO2, #32
145145

146146
.endm
@@ -152,7 +152,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
152152
fldd d1 , [ AO2, #0 ]
153153
add AO1, AO1, #8
154154

155-
fstmiad BO!, { d0 - d1 }
155+
vstmia.f64 BO!, { d0 - d1 }
156156
add AO2, AO2, #8
157157

158158
.endm
@@ -164,7 +164,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
164164
fldd d2 , [ AO1, #16 ]
165165
fldd d3 , [ AO1, #24 ]
166166

167-
fstmiad BO!, { d0 - d3 }
167+
vstmia.f64 BO!, { d0 - d3 }
168168
add AO1, AO1, #32
169169

170170
.endm
@@ -174,7 +174,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
174174

175175
fldd d0 , [ AO1, #0 ]
176176

177-
fstmiad BO!, { d0 }
177+
vstmia.f64 BO!, { d0 }
178178
add AO1, AO1, #8
179179

180180
.endm

‎kernel/arm/sgemm_ncopy_2_vfp.S

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
7373
flds s3 , [ AO2, #4 ]
7474

7575
add AO1, AO1, #8
76-
fstmias BO!, { s0 - s3 }
76+
vstmia.f32 BO!, { s0 - s3 }
7777
add AO2, AO2, #8
7878

7979
.endm
@@ -85,7 +85,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
8585
flds s1 , [ AO2, #0 ]
8686
add AO1, AO1, #4
8787

88-
fstmias BO!, { s0 - s1 }
88+
vstmia.f32 BO!, { s0 - s1 }
8989
add AO2, AO2, #4
9090

9191
.endm
@@ -95,7 +95,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
9595
flds s0 , [ AO1, #0 ]
9696
flds s1 , [ AO1, #4 ]
9797

98-
fstmias BO!, { s0 - s1 }
98+
vstmia.f32 BO!, { s0 - s1 }
9999
add AO1, AO1, #8
100100

101101
.endm
@@ -105,7 +105,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
105105

106106
flds s0 , [ AO1, #0 ]
107107

108-
fstmias BO!, { s0 }
108+
vstmia.f32 BO!, { s0 }
109109
add AO1, AO1, #4
110110

111111
.endm

‎kernel/arm/sgemm_ncopy_4_vfp.S

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,10 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
100100
flds s11, [ AO4, #8 ]
101101
flds s15, [ AO4, #12 ]
102102

103-
fstmias BO!, { s0 - s3 }
103+
vstmia.f32 BO!, { s0 - s3 }
104104
add AO4, AO4, #16
105-
fstmias BO!, { s4 - s7 }
106-
fstmias BO!, { s8 - s15 }
105+
vstmia.f32 BO!, { s4 - s7 }
106+
vstmia.f32 BO!, { s8 - s15 }
107107

108108
.endm
109109

@@ -117,7 +117,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
117117
flds s3 , [ AO4, #0 ]
118118

119119
add AO3, AO3, #4
120-
fstmias BO!, { s0 - s3 }
120+
vstmia.f32 BO!, { s0 - s3 }
121121
add AO4, AO4, #4
122122

123123
.endm
@@ -135,7 +135,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
135135
flds s5 , [ AO2, #8 ]
136136
flds s7 , [ AO2, #12 ]
137137

138-
fstmias BO!, { s0 - s7 }
138+
vstmia.f32 BO!, { s0 - s7 }
139139
add AO2, AO2, #16
140140

141141
.endm
@@ -147,7 +147,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
147147
flds s1 , [ AO2, #0 ]
148148
add AO1, AO1, #4
149149

150-
fstmias BO!, { s0 - s1 }
150+
vstmia.f32 BO!, { s0 - s1 }
151151
add AO2, AO2, #4
152152

153153
.endm
@@ -159,7 +159,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
159159
flds s2 , [ AO1, #8 ]
160160
flds s3 , [ AO1, #12 ]
161161

162-
fstmias BO!, { s0 - s3 }
162+
vstmia.f32 BO!, { s0 - s3 }
163163
add AO1, AO1, #16
164164

165165
.endm
@@ -169,7 +169,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
169169

170170
flds s0 , [ AO1, #0 ]
171171

172-
fstmias BO!, { s0 }
172+
vstmia.f32 BO!, { s0 }
173173
add AO1, AO1, #4
174174

175175
.endm

‎kernel/arm/zgemm_ncopy_2_vfp.S

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
8787
fldd d6 , [ AO2, #16 ]
8888
fldd d7 , [ AO2, #24 ]
8989

90-
fstmiad BO!, { d0 - d7 }
90+
vstmia.f64 BO!, { d0 - d7 }
9191
add AO2, AO2, #32
9292

9393
.endm
@@ -101,7 +101,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
101101
fldd d3 , [ AO2, #8 ]
102102

103103
add AO1, AO1, #16
104-
fstmiad BO!, { d0 - d3 }
104+
vstmia.f64 BO!, { d0 - d3 }
105105
add AO2, AO2, #16
106106

107107
.endm
@@ -113,7 +113,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
113113
fldd d2 , [ AO1, #16 ]
114114
fldd d3 , [ AO1, #24 ]
115115

116-
fstmiad BO!, { d0 - d3 }
116+
vstmia.f64 BO!, { d0 - d3 }
117117
add AO1, AO1, #32
118118

119119
.endm
@@ -124,7 +124,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
124124
fldd d0 , [ AO1, #0 ]
125125
fldd d1 , [ AO1, #8 ]
126126

127-
fstmiad BO!, { d0 - d1 }
127+
vstmia.f64 BO!, { d0 - d1 }
128128
add AO1, AO1, #16
129129

130130
.endm

‎kernel/arm/ztrmm_kernel_2x2_vfp.S

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
385385
FMAC_R2 d6 , d1 , d11
386386
FMAC_I2 d7 , d1 , d10
387387

388-
fstmiad CO1, { d4 - d7 }
388+
vstmia.f64 CO1, { d4 - d7 }
389389

390390
fldd d4 , FP_ZERO
391391
vmov.f64 d5 , d4
@@ -402,7 +402,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
402402
FMAC_R2 d6 , d1 , d15
403403
FMAC_I2 d7 , d1 , d14
404404

405-
fstmiad CO2, { d4 - d7 }
405+
vstmia.f64 CO2, { d4 - d7 }
406406

407407
add CO1, CO1, #32
408408

@@ -567,7 +567,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
567567
FMAC_R2 d4 , d1 , d9
568568
FMAC_I2 d5 , d1 , d8
569569

570-
fstmiad CO1, { d4 - d5 }
570+
vstmia.f64 CO1, { d4 - d5 }
571571

572572
fldd d4 , FP_ZERO
573573
vmov.f64 d5 , d4
@@ -577,7 +577,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
577577
FMAC_R2 d4 , d1 , d13
578578
FMAC_I2 d5 , d1 , d12
579579

580-
fstmiad CO2, { d4 - d5 }
580+
vstmia.f64 CO2, { d4 - d5 }
581581

582582
add CO1, CO1, #16
583583

@@ -747,7 +747,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
747747
FMAC_R2 d6 , d1 , d11
748748
FMAC_I2 d7 , d1 , d10
749749

750-
fstmiad CO1, { d4 - d7 }
750+
vstmia.f64 CO1, { d4 - d7 }
751751

752752
add CO1, CO1, #32
753753

@@ -872,7 +872,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
872872
FMAC_R2 d4 , d1 , d9
873873
FMAC_I2 d5 , d1 , d8
874874

875-
fstmiad CO1, { d4 - d5 }
875+
vstmia.f64 CO1, { d4 - d5 }
876876

877877
add CO1, CO1, #16
878878

‎kernel/arm/ztrmm_kernel_2x2_vfpv3.S

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -391,8 +391,8 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
391391
FMAC_R2 d10, d1 , d23
392392
FMAC_I2 d11, d1 , d22
393393

394-
fstmiad CO1, { d4 - d7 }
395-
fstmiad CO2, { d8 - d11 }
394+
vstmia.f64 CO1, { d4 - d7 }
395+
vstmia.f64 CO2, { d8 - d11 }
396396

397397
add CO1, CO1, #32
398398

@@ -569,8 +569,8 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
569569
FMAC_R2 d8 , d1 , d21
570570
FMAC_I2 d9 , d1 , d20
571571

572-
fstmiad CO1, { d4 - d5 }
573-
fstmiad CO2, { d8 - d9 }
572+
vstmia.f64 CO1, { d4 - d5 }
573+
vstmia.f64 CO2, { d8 - d9 }
574574

575575
add CO1, CO1, #16
576576

@@ -747,7 +747,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
747747
FMAC_R2 d6 , d1 , d19
748748
FMAC_I2 d7 , d1 , d18
749749

750-
fstmiad CO1, { d4 - d7 }
750+
vstmia.f64 CO1, { d4 - d7 }
751751

752752
add CO1, CO1, #32
753753

@@ -872,7 +872,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
872872
FMAC_R2 d4 , d1 , d17
873873
FMAC_I2 d5 , d1 , d16
874874

875-
fstmiad CO1, { d4 - d5 }
875+
vstmia.f64 CO1, { d4 - d5 }
876876

877877
add CO1, CO1, #16
878878

0 commit comments

Comments
 (0)