search

sendaoYan / riscv-port-jdk8u-ysd

https://openjdk.org/projects/riscv-port
GNU General Public License v2.0
0 stars 0 forks source link

[riscv64-8u]riscv.ad:695:10: fatal error: gc/shared/cardTable.hpp: No such file or directory #14

Open sendaoYan opened 3 days ago

sendaoYan commented 3 days ago 
+ cd build/linux-riscv64-normal-server-release/hotspot/linux_riscv_compiler2/generated
+ /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/ad_riscv.o.d -fpch-deps -o ad_riscv.o ../generated/adfiles/ad_riscv.cpp
In file included from ../generated/adfiles/ad_riscv.cpp:31:
/home/yansendao/git/riscv-port-jdk8u-ysd/hotspot/src/cpu/riscv/vm/riscv.ad:695:10: fatal error: gc/shared/cardTable.hpp: No such file or directory
  695 | #include "gc/shared/cardTable.hpp"
      |          ^~~~~~~~~~~~~~~~~~~~~~~~~
compilation terminated.

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

( ( set -x ; cd build/linux-riscv64-normal-server-release/hotspot/linux_riscv_compiler2/generated && time /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/ad_riscv.o.d -fpch-deps -o ad_riscv.o ../generated/adfiles/ad_riscv.cpp ) &> ad_riscv.log ; echo $? ; download ad_riscv.log ) &
sendaoYan commented 3 days ago

8195142: Refactor out card table from CardTableModRefBS to flatten the BarrierSet hierarchy

sendaoYan commented 3 days ago

JDK-8195142.patch

diff --git a/hotspot/src/cpu/riscv/vm/c1_Runtime1_riscv.cpp b/hotspot/src/cpu/riscv/vm/c1_Runtime1_riscv.cpp
index 329df2e1ca7..42fb61cb2a0 100644
--- a/hotspot/src/cpu/riscv/vm/c1_Runtime1_riscv.cpp
+++ b/hotspot/src/cpu/riscv/vm/c1_Runtime1_riscv.cpp
@@ -32,8 +32,6 @@
 #include "c1/c1_Runtime1.hpp"
 #include "compiler/disassembler.hpp"
 #include "compiler/oopMap.hpp"
-#include "gc/shared/cardTable.hpp"
-#include "gc/shared/cardTableBarrierSet.hpp"
 #include "interpreter/interpreter.hpp"
 #include "memory/universe.hpp"
 #include "nativeInst_riscv.hpp"
diff --git a/hotspot/src/cpu/riscv/vm/macroAssembler_riscv.cpp b/hotspot/src/cpu/riscv/vm/macroAssembler_riscv.cpp
index 4434e890a88..01fe0155ee2 100644
--- a/hotspot/src/cpu/riscv/vm/macroAssembler_riscv.cpp
+++ b/hotspot/src/cpu/riscv/vm/macroAssembler_riscv.cpp
@@ -30,8 +30,6 @@
 #include "compiler/disassembler.hpp"
 #include "gc/shared/barrierSet.hpp"
 #include "gc/shared/barrierSetAssembler.hpp"
-#include "gc/shared/cardTable.hpp"
-#include "gc/shared/cardTableBarrierSet.hpp"
 #include "interpreter/bytecodeHistogram.hpp"
 #include "interpreter/interpreter.hpp"
 #include "memory/resourceArea.hpp"
diff --git a/hotspot/src/cpu/riscv/vm/riscv.ad b/hotspot/src/cpu/riscv/vm/riscv.ad
index 7f587c58be8..4bdeed4f8d0 100644
--- a/hotspot/src/cpu/riscv/vm/riscv.ad
+++ b/hotspot/src/cpu/riscv/vm/riscv.ad
@@ -692,7 +692,6 @@ definitions %{
 source_hpp %{

 #include "asm/macroAssembler.hpp"
-#include "gc/shared/cardTable.hpp"
 #include "gc/shared/cardTableBarrierSet.hpp"
 #include "gc/shared/collectedHeap.hpp"
 #include "opto/addnode.hpp"
@@ -2656,7 +2655,7 @@ operand immByteMapBase()
 %{
   // Get base of card map
   predicate(BarrierSet::barrier_set()->is_a(BarrierSet::CardTableBarrierSet) &&
-            (jbyte*)n->get_ptr() == ((CardTableBarrierSet*)(BarrierSet::barrier_set()))->card_table()->byte_map_base());
+    (jbyte*)n->get_ptr() == ((CardTableModRefBS*)(Universe::heap()->barrier_set()))->byte_map_base);
   match(ConP);

   op_cost(0);
sendaoYan commented 3 days ago

14.patch To github.com:sendaoYan/riscv-port-jdk8u-ysd.git 5fa2b0ed2c0..3c187757e61 minus-jbs8276799 -> minus-jbs8276799 ad_riscv.log make-riscv64.log