8355704: RISC-V: enable TestIRFma.java

Reviewed-by: rehn, luhenry

Author: Hamlin Li

test/hotspot/jtreg/compiler/c2/irTests/TestIRFma.java

@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2023, Arm Limited. All rights reserved.
+ * Copyright (c) 2025, Rivos Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -87,97 +88,125 @@ public void assertResult(double a, double b, double c) {
     @Test
     @IR(counts = {IRNode.FMSUB, "> 0"},
         applyIfCPUFeature = {"asimd", "true"})
+    @IR(counts = {IRNode.FMA_F, "= 1"},
+        applyIfPlatform = {"riscv64", "true"}, applyIf = {"UseFMA", "true"})
     static float test1(float a, float b, float c) {
         return Math.fma(-a, -b, c);
     }
 
     @Test
     @IR(counts = {IRNode.FMSUB, "> 0"},
         applyIfCPUFeature = {"asimd", "true"})
+    @IR(counts = {IRNode.FMA_D, "= 1"},
+        applyIfPlatform = {"riscv64", "true"}, applyIf = {"UseFMA", "true"})
     static double test2(double a, double b, double c) {
         return Math.fma(-a, -b, c);
     }
 
     @Test
     @IR(counts = {IRNode.FMSUB, "> 0"},
         applyIfCPUFeature = {"asimd", "true"})
+    @IR(counts = {IRNode.FMA_F, "= 1"},
+        applyIfPlatform = {"riscv64", "true"}, applyIf = {"UseFMA", "true"})
     static float test3(float a, float b, float c) {
         return Math.fma(-a, b, c);
     }
 
     @Test
     @IR(counts = {IRNode.FMSUB, "> 0"},
         applyIfCPUFeature = {"asimd", "true"})
+    @IR(counts = {IRNode.FMA_D, "= 1"},
+        applyIfPlatform = {"riscv64", "true"}, applyIf = {"UseFMA", "true"})
     static double test4(double a, double b, double c) {
         return Math.fma(-a, b, c);
     }
 
     @Test
     @IR(counts = {IRNode.FMSUB, "> 0"},
         applyIfCPUFeature = {"asimd", "true"})
+    @IR(counts = {IRNode.FMA_F, "= 1"},
+        applyIfPlatform = {"riscv64", "true"}, applyIf = {"UseFMA", "true"})
     static float test5(float a, float b, float c) {
         return Math.fma(a, -b, c);
     }
 
     @Test
     @IR(counts = {IRNode.FMSUB, "> 0"},
         applyIfCPUFeature = {"asimd", "true"})
+    @IR(counts = {IRNode.FMA_D, "= 1"},
+        applyIfPlatform = {"riscv64", "true"}, applyIf = {"UseFMA", "true"})
     static double test6(double a, double b, double c) {
         return Math.fma(a, -b, c);
     }
 
     @Test
     @IR(counts = {IRNode.FNMADD, "> 0"},
         applyIfCPUFeature = {"asimd", "true"})
+    @IR(counts = {IRNode.FMA_F, "= 1"},
+        applyIfPlatform = {"riscv64", "true"}, applyIf = {"UseFMA", "true"})
     static float test7(float a, float b, float c) {
         return Math.fma(-a, b, -c);
     }
 
     @Test
     @IR(counts = {IRNode.FNMADD, "> 0"},
         applyIfCPUFeature = {"asimd", "true"})
+    @IR(counts = {IRNode.FMA_D, "= 1"},
+        applyIfPlatform = {"riscv64", "true"}, applyIf = {"UseFMA", "true"})
     static double test8(double a, double b, double c) {
         return Math.fma(-a, b, -c);
     }
 
     @Test
     @IR(counts = {IRNode.FNMADD, "> 0"},
         applyIfCPUFeature = {"asimd", "true"})
+    @IR(counts = {IRNode.FMA_F, "= 1"},
+        applyIfPlatform = {"riscv64", "true"}, applyIf = {"UseFMA", "true"})
     static float test9(float a, float b, float c) {
         return Math.fma(a, -b, -c);
     }
 
     @Test
     @IR(counts = {IRNode.FNMADD, "> 0"},
         applyIfCPUFeature = {"asimd", "true"})
+    @IR(counts = {IRNode.FMA_D, "= 1"},
+        applyIfPlatform = {"riscv64", "true"}, applyIf = {"UseFMA", "true"})
     static double test10(double a, double b, double c) {
         return Math.fma(a, -b, -c);
     }
 
     @Test
     @IR(counts = {IRNode.FNMSUB, "> 0"},
         applyIfCPUFeature = {"asimd", "true"})
+    @IR(counts = {IRNode.FMA_F, "= 1"},
+        applyIfPlatform = {"riscv64", "true"}, applyIf = {"UseFMA", "true"})
     static float test11(float a, float b, float c) {
         return Math.fma(a, b, -c);
     }
 
     @Test
     @IR(counts = {IRNode.FNMSUB, "> 0"},
         applyIfCPUFeature = {"asimd", "true"})
+    @IR(counts = {IRNode.FMA_D, "= 1"},
+        applyIfPlatform = {"riscv64", "true"}, applyIf = {"UseFMA", "true"})
     static double test12(double a, double b, double c) {
         return Math.fma(a, b, -c);
     }
 
     @Test
     @IR(counts = {IRNode.FNMADD, "> 0"},
         applyIfCPUFeature = {"asimd", "true"})
+    @IR(counts = {IRNode.FMA_F, "= 1"},
+        applyIfPlatform = {"riscv64", "true"}, applyIf = {"UseFMA", "true"})
     static float test13(float a, float b, float c) {
         return Math.fma(-a, -b, -c);
     }
 
     @Test
     @IR(counts = {IRNode.FNMADD, "> 0"},
         applyIfCPUFeature = {"asimd", "true"})
+    @IR(counts = {IRNode.FMA_D, "= 1"},
+        applyIfPlatform = {"riscv64", "true"}, applyIf = {"UseFMA", "true"})
     static double test14(double a, double b, double c) {
         return Math.fma(-a, -b, -c);
     }

test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java

@@ -2511,6 +2511,16 @@ public class IRNode {
         machOnlyNameRegex(FNMSUB, "mnsub(F|D)_reg_reg");
     }
 
+    public static final String FMA_F = PREFIX + "FMA_F" + POSTFIX;
+    static {
+        beforeMatchingNameRegex(FMA_F, "FmaF");
+    }
+
+    public static final String FMA_D = PREFIX + "FMA_D" + POSTFIX;
+    static {
+        beforeMatchingNameRegex(FMA_D, "FmaD");
+    }
+
     public static final String VFMLA = PREFIX + "VFMLA" + POSTFIX;
     static {
         machOnlyNameRegex(VFMLA, "vfmla");