[riscv64-8u]c1_LIRGenerator_riscv.cpp:1195:5: error: ‘increment_backedge_counter_conditionally’ was not declared in this scope

[sendaoYan]

+ cd build/linux-riscv64-normal-server-release/hotspot/linux_riscv_compiler2/generated
+ bash -c '/usr/bin/g++ -DLINUX -D_GNU_SOURCE -DRISCV64 -DPRODUCT -I. -I/home/yansendao/git/riscv-port-jdk8u-ysd/hotspot/src/share/vm/prims -I/home/yansendao/git/riscv-port-jdk8u-ysd/hotspot/src/share/vm -I/home/yansendao/git/riscv-port-jdk8u-ysd/hotspot/src/share/vm/precompiled -I/home/yansendao/git/riscv-port-jdk8u-ysd/hotspot/src/cpu/riscv/vm -I/home/yansendao/git/riscv-port-jdk8u-ysd/hotspot/src/os_cpu/linux_riscv/vm -I/home/yansendao/git/riscv-port-jdk8u-ysd/hotspot/src/os/linux/vm -I/home/yansendao/git/riscv-port-jdk8u-ysd/hotspot/src/os/posix/vm -I../generated -DHOTSPOT_RELEASE_VERSION="\"25.412-b00\"" -DHOTSPOT_BUILD_TARGET="\"product\"" -DHOTSPOT_BUILD_USER="\"yansendao\"" -DHOTSPOT_LIB_ARCH=\"riscv64\" -DHOTSPOT_VM_DISTRO="\"OpenJDK\""  -DTARGET_OS_FAMILY_linux -DTARGET_ARCH_riscv -DTARGET_ARCH_MODEL_riscv -DTARGET_OS_ARCH_linux_riscv -DTARGET_OS_ARCH_MODEL_linux_riscv64 -DTARGET_COMPILER_gcc -DINCLUDE_JFR=1 -DCOMPILER2 -DCOMPILER1 -fPIC -fno-rtti -fno-exceptions -D_REENTRANT -fcheck-new -fvisibility=hidden  -pipe -fno-strict-aliasing  -fno-omit-frame-pointer -O3  -g -DVM_LITTLE_ENDIAN -D_LP64=1 -Werror -Wpointer-arith -Wsign-compare -Wundef -Wunused-function -Wunused-value -Wformat=2 -Wreturn-type   -fstack-protector  -fno-delete-null-pointer-checks -fno-lifetime-dse -std=gnu++98 -DDTRACE_ENABLED -c -MMD -MP -MF ../generated/dependencies/c1_LIRGenerator_riscv.o.d -fpch-deps -o c1_LIRGenerator_riscv.o /home/yansendao/git/riscv-port-jdk8u-ysd/hotspot/src/cpu/riscv/vm/c1_LIRGenerator_riscv.cpp'
/home/yansendao/git/riscv-port-jdk8u-ysd/hotspot/src/cpu/riscv/vm/c1_LIRGenerator_riscv.cpp: In member function ‘virtual void LIRGenerator::do_If(If*)’:
/home/yansendao/git/riscv-port-jdk8u-ysd/hotspot/src/cpu/riscv/vm/c1_LIRGenerator_riscv.cpp:1195:5: error: ‘increment_backedge_counter_conditionally’ was not declared in this scope; did you mean ‘increment_backedge_counter’?
 1195 |     increment_backedge_counter_conditionally(lir_cond(cond), left, right, state_for(x, x->state_before()),
      |     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
      |     increment_backedge_counter

standalone.log

[sendaoYan]

8201447: C1 does backedge profiling incorrectly

[sendaoYan]

JDK-8201447.patch

[sendaoYan]

make-aarch64-fastdebug.log make-aarch64-release.log make-aarch64-slowdebug.log make-riscv64-fastdebug.log make-riscv64-release.log make-riscv64-slowdebug.log make-x86_64-fastdebug.log make-x86_64-release.log make-x86_64-slowdebug.log standalone.log

[sendaoYan]

diff --git a/hotspot/src/cpu/riscv/vm/c1_LIRGenerator_riscv.cpp b/hotspot/src/cpu/riscv/vm/c1_LIRGenerator_riscv.cpp
index 5c7e5872e17..d6c63feecfc 100644
--- a/hotspot/src/cpu/riscv/vm/c1_LIRGenerator_riscv.cpp
+++ b/hotspot/src/cpu/riscv/vm/c1_LIRGenerator_riscv.cpp
@@ -1184,19 +1184,18 @@ void LIRGenerator::do_If(If* x) {
   xin->load_item();
   yin->load_item();

-  set_no_result(x);
-
-  LIR_Opr left = xin->result();
-  LIR_Opr right = yin->result();
-
   // add safepoint before generating condition code so it can be recomputed
   if (x->is_safepoint()) {
     // increment backedge counter if needed
-    increment_backedge_counter_conditionally(lir_cond(cond), left, right, state_for(x, x->state_before()),
-                                             x->tsux()->bci(), x->fsux()->bci(), x->profiled_bci());
+    increment_backedge_counter(state_for(x, x->state_before()), x->profiled_bci());
     __ safepoint(LIR_OprFact::illegalOpr, state_for(x, x->state_before()));
   }

+  set_no_result(x);
+
+  LIR_Opr left = xin->result();
+  LIR_Opr right = yin->result();
+
   // Generate branch profiling. Profiling code doesn't kill flags.
   __ cmp(lir_cond(cond), left, right);
   profile_branch(x, cond);

61.patch standalone.log

[sendaoYan]

To github.com:sendaoYan/riscv-port-jdk8u-ysd.git 6d726330ef7..2a10656d5f5 minus-jbs8276799 -> minus-jbs8276799

[sendaoYan]

make-aarch64-fastdebug.log make-aarch64-release.log make-aarch64-slowdebug.log make-riscv64-fastdebug.log make-riscv64-release.log make-riscv64-slowdebug.log make-x86_64-fastdebug.log make-x86_64-release.log make-x86_64-slowdebug.log standalone.log