Skip to content

Commit c6d798c

Browse files
Dong BoVladimir Kozlov
Dong Bo
authored and
Vladimir Kozlov
committedJan 13, 2021
8259629: aarch64 builds fail after JDK-8258932
Reviewed-by: kvn
1 parent 4be2173 commit c6d798c

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed
 

‎test/hotspot/gtest/aarch64/aarch64-asmtest.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -1040,7 +1040,10 @@ def generate(self):
10401040

10411041
def cstr(self):
10421042
buf = Instruction.cstr(self) + str(self.dstSIMDreg)
1043-
buf = '%s, __ T%s, %s);' % (buf, self.arrangement, self.srcSIMDreg)
1043+
if self._name == "fmaxp" or self._name == "fminp":
1044+
buf = '%s, %s, __ %s);' % (buf, self.srcSIMDreg, self.arrangement[1:])
1045+
else:
1046+
buf = '%s, __ T%s, %s);' % (buf, self.arrangement, self.srcSIMDreg)
10441047
return buf
10451048

10461049
def astr(self):

‎test/hotspot/gtest/aarch64/asmtest.out.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -540,10 +540,10 @@
540540
__ sminv(v19, __ T8H, v20); // sminv h19, v20.8H
541541
__ sminv(v15, __ T4S, v16); // sminv s15, v16.4S
542542
__ fminv(v0, __ T4S, v1); // fminv s0, v1.4S
543-
__ fmaxp(v4, __ T2S, v5); // fmaxp s4, v5.2S
544-
__ fmaxp(v20, __ T2D, v21); // fmaxp d20, v21.2D
545-
__ fminp(v11, __ T2S, v12); // fminp s11, v12.2S
546-
__ fminp(v29, __ T2D, v30); // fminp d29, v30.2D
543+
__ fmaxp(v4, v5, __ S); // fmaxp s4, v5.2S
544+
__ fmaxp(v20, v21, __ D); // fmaxp d20, v21.2D
545+
__ fminp(v11, v12, __ S); // fminp s11, v12.2S
546+
__ fminp(v29, v30, __ D); // fminp d29, v30.2D
547547

548548
// TwoRegNEONOp
549549
__ absr(v15, __ T8B, v16); // abs v15.8B, v16.8B

0 commit comments

Comments
 (0)
Please sign in to comment.