8319705: RISC-V: signumF/D intrinsics fails compiler/intrinsics/math/TestSignumIntrinsic.java

Reviewed-by: fyang, vkempik

src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp

@@ -1658,25 +1658,20 @@ void C2_MacroAssembler::round_double_mode(FloatRegister dst, FloatRegister src,
 // otherwise return +/- 1.0 using sign of input.
 // one - gives us a floating-point 1.0 (got from matching rule)
 // bool is_double - specifies single or double precision operations will be used.
-void C2_MacroAssembler::signum_fp(FloatRegister dst, FloatRegister src, FloatRegister one, bool is_double) {
+void C2_MacroAssembler::signum_fp(FloatRegister dst, FloatRegister one, bool is_double) {
-  Register tmp1 = t0;
-
   Label done;
 
-  is_double ? fclass_d(tmp1, src)
+  is_double ? fclass_d(t0, dst)
-            : fclass_s(tmp1, src);
+            : fclass_s(t0, dst);
-
-  is_double ? fmv_d(dst, src)
-            : fmv_s(dst, src);
 
   // check if input is -0, +0, signaling NaN or quiet NaN
-  andi(tmp1, tmp1, fclass_mask::zero | fclass_mask::nan);
+  andi(t0, t0, fclass_mask::zero | fclass_mask::nan);
 
-  bnez(tmp1, done);
+  bnez(t0, done);
 
   // use floating-point 1.0 with a sign of input
-  is_double ? fsgnj_d(dst, one, src)
+  is_double ? fsgnj_d(dst, one, dst)
-            : fsgnj_s(dst, one, src);
+            : fsgnj_s(dst, one, dst);
 
   bind(done);
 }

src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.hpp

@@ -157,8 +157,7 @@
   void round_double_mode(FloatRegister dst, FloatRegister src, int round_mode,
                          Register tmp1, Register tmp2, Register tmp3);
 
-  void signum_fp(FloatRegister dst, FloatRegister src, FloatRegister one,
+  void signum_fp(FloatRegister dst, FloatRegister one, bool is_double);
-                 bool is_double);
 
   // intrinsic methods implemented by rvv instructions
   void string_equals_v(Register r1, Register r2,

src/hotspot/cpu/riscv/riscv.ad

@@ -7601,22 +7601,20 @@ instruct copySignF_reg(fRegF dst, fRegF src1, fRegF src2) %{
   ins_pipe(fp_dop_reg_reg_s);
 %}
 
-instruct signumD_reg(fRegD dst, fRegD src, immD zero, fRegD one) %{
+instruct signumD_reg(fRegD dst, immD zero, fRegD one) %{
-  match(Set dst (SignumD src (Binary zero one)));
+  match(Set dst (SignumD dst (Binary zero one)));
-  format %{ "signumD  $dst, $src" %}
+  format %{ "signumD  $dst, $dst" %}
   ins_encode %{
-    __ signum_fp(as_FloatRegister($dst$$reg), as_FloatRegister($src$$reg),
+    __ signum_fp(as_FloatRegister($dst$$reg), as_FloatRegister($one$$reg), true /* is_double */);
-                 as_FloatRegister($one$$reg), true /* is_double */);
   %}
   ins_pipe(pipe_class_default);
 %}
 
-instruct signumF_reg(fRegF dst, fRegF src, immF zero, fRegF one) %{
+instruct signumF_reg(fRegF dst, immF zero, fRegF one) %{
-  match(Set dst (SignumF src (Binary zero one)));
+  match(Set dst (SignumF dst (Binary zero one)));
-  format %{ "signumF  $dst, $src" %}
+  format %{ "signumF  $dst, $dst" %}
   ins_encode %{
-    __ signum_fp(as_FloatRegister($dst$$reg), as_FloatRegister($src$$reg),
+    __ signum_fp(as_FloatRegister($dst$$reg), as_FloatRegister($one$$reg), false /* is_double */);
-                 as_FloatRegister($one$$reg), false /* is_double */);
   %}
   ins_pipe(pipe_class_default);
 %}

test/hotspot/jtreg/compiler/intrinsics/math/TestSignumIntrinsic.java

@@ -35,6 +35,10 @@
  *      -XX:+IgnoreUnrecognizedVMOptions -XX:+UnlockDiagnosticVMOptions
  *      -XX:-UseSignumIntrinsic -XX:+UseCopySignIntrinsic
  *      compiler.intrinsics.math.TestSignumIntrinsic
+ * @run main/othervm
+ *      -XX:+IgnoreUnrecognizedVMOptions -XX:+UnlockDiagnosticVMOptions
+ *      -Xcomp -XX:+UseSignumIntrinsic
+ *      compiler.intrinsics.math.TestSignumIntrinsic
  */
 
 package compiler.intrinsics.math;