Revert "remove EnableJVMCI flag"

This reverts commit c4f083c.

Author: dougxc

src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp

@@ -603,13 +603,15 @@ void SharedRuntime::gen_i2c_adapter(MacroAssembler *masm,
   __ ldr(rscratch1, Address(rmethod, in_bytes(Method::from_compiled_offset())));
 
 #if INCLUDE_JVMCI
-  // check if this call should be routed towards a specific entry point
-  __ ldr(rscratch2, Address(rthread, in_bytes(JavaThread::jvmci_alternate_call_target_offset())));
-  Label no_alternative_target;
-  __ cbz(rscratch2, no_alternative_target);
-  __ mov(rscratch1, rscratch2);
-  __ str(zr, Address(rthread, in_bytes(JavaThread::jvmci_alternate_call_target_offset())));
-  __ bind(no_alternative_target);
+  if (EnableJVMCI) {
+    // check if this call should be routed towards a specific entry point
+    __ ldr(rscratch2, Address(rthread, in_bytes(JavaThread::jvmci_alternate_call_target_offset())));
+    Label no_alternative_target;
+    __ cbz(rscratch2, no_alternative_target);
+    __ mov(rscratch1, rscratch2);
+    __ str(zr, Address(rthread, in_bytes(JavaThread::jvmci_alternate_call_target_offset())));
+    __ bind(no_alternative_target);
+  }
 #endif // INCLUDE_JVMCI
 
   // Now generate the shuffle code.
@@ -2210,7 +2212,9 @@ void SharedRuntime::generate_deopt_blob() {
   // Setup code generation tools
   int pad = 0;
 #if INCLUDE_JVMCI
-  pad += 512; // Increase the buffer size for JVMCI
+  if (EnableJVMCI) {
+    pad += 512; // Increase the buffer size when compiling for JVMCI
+  }
 #endif
   const char* name = SharedRuntime::stub_name(SharedStubId::deopt_id);
   CodeBuffer buffer(name, 2048+pad, 1024);
@@ -2281,9 +2285,12 @@ void SharedRuntime::generate_deopt_blob() {
 
 #if INCLUDE_JVMCI
   Label after_fetch_unroll_info_call;
-  int implicit_exception_uncommon_trap_offset = __ pc() - start;
-  int uncommon_trap_offset;
-  {
+  int implicit_exception_uncommon_trap_offset = 0;
+  int uncommon_trap_offset = 0;
+
+  if (EnableJVMCI) {
+    implicit_exception_uncommon_trap_offset = __ pc() - start;
+
     __ ldr(lr, Address(rthread, in_bytes(JavaThread::jvmci_implicit_exception_pc_offset())));
     __ str(zr, Address(rthread, in_bytes(JavaThread::jvmci_implicit_exception_pc_offset())));
 
@@ -2303,16 +2310,16 @@ void SharedRuntime::generate_deopt_blob() {
     __ mov(c_rarg0, rthread);
     __ movw(c_rarg2, rcpool); // exec mode
     __ lea(rscratch1,
-            RuntimeAddress(CAST_FROM_FN_PTR(address,
-                                            Deoptimization::uncommon_trap)));
+           RuntimeAddress(CAST_FROM_FN_PTR(address,
+                                           Deoptimization::uncommon_trap)));
     __ blr(rscratch1);
     __ bind(retaddr);
     oop_maps->add_gc_map( __ pc()-start, map->deep_copy());
 
     __ reset_last_Java_frame(false);
 
     __ b(after_fetch_unroll_info_call);
-  }
+  } // EnableJVMCI
 #endif // INCLUDE_JVMCI
 
   int exception_offset = __ pc() - start;
@@ -2406,7 +2413,9 @@ void SharedRuntime::generate_deopt_blob() {
   __ reset_last_Java_frame(false);
 
 #if INCLUDE_JVMCI
-  __ bind(after_fetch_unroll_info_call);
+  if (EnableJVMCI) {
+    __ bind(after_fetch_unroll_info_call);
+  }
 #endif
 
   // Load UnrollBlock* into r5
@@ -2566,8 +2575,10 @@ void SharedRuntime::generate_deopt_blob() {
   _deopt_blob = DeoptimizationBlob::create(&buffer, oop_maps, 0, exception_offset, reexecute_offset, frame_size_in_words);
   _deopt_blob->set_unpack_with_exception_in_tls_offset(exception_in_tls_offset);
 #if INCLUDE_JVMCI
-  _deopt_blob->set_uncommon_trap_offset(uncommon_trap_offset);
-  _deopt_blob->set_implicit_exception_uncommon_trap_offset(implicit_exception_uncommon_trap_offset);
+  if (EnableJVMCI) {
+    _deopt_blob->set_uncommon_trap_offset(uncommon_trap_offset);
+    _deopt_blob->set_implicit_exception_uncommon_trap_offset(implicit_exception_uncommon_trap_offset);
+  }
 #endif
 }
 

src/hotspot/cpu/aarch64/templateInterpreterGenerator_aarch64.cpp

@@ -527,7 +527,7 @@ address TemplateInterpreterGenerator::generate_deopt_entry_for(TosState state,
 #if INCLUDE_JVMCI
   // Check if we need to take lock at entry of synchronized method.  This can
   // only occur on method entry so emit it only for vtos with step 0.
-  if (state == vtos && step == 0) {
+  if (EnableJVMCI && state == vtos && step == 0) {
     Label L;
     __ ldrb(rscratch1, Address(rthread, JavaThread::pending_monitorenter_offset()));
     __ cbz(rscratch1, L);
@@ -538,11 +538,13 @@ address TemplateInterpreterGenerator::generate_deopt_entry_for(TosState state,
     __ bind(L);
   } else {
 #ifdef ASSERT
-    Label L;
-    __ ldrb(rscratch1, Address(rthread, JavaThread::pending_monitorenter_offset()));
-    __ cbz(rscratch1, L);
-    __ stop("unexpected pending monitor in deopt entry");
-    __ bind(L);
+    if (EnableJVMCI) {
+      Label L;
+      __ ldrb(rscratch1, Address(rthread, JavaThread::pending_monitorenter_offset()));
+      __ cbz(rscratch1, L);
+      __ stop("unexpected pending monitor in deopt entry");
+      __ bind(L);
+    }
 #endif
   }
 #endif

src/hotspot/cpu/riscv/sharedRuntime_riscv.cpp

@@ -493,13 +493,15 @@ void SharedRuntime::gen_i2c_adapter(MacroAssembler *masm,
   __ ld(t1, Address(xmethod, in_bytes(Method::from_compiled_offset())));
 
 #if INCLUDE_JVMCI
-  // check if this call should be routed towards a specific entry point
-  __ ld(t0, Address(xthread, in_bytes(JavaThread::jvmci_alternate_call_target_offset())));
-  Label no_alternative_target;
-  __ beqz(t0, no_alternative_target);
-  __ mv(t1, t0);
-  __ sd(zr, Address(xthread, in_bytes(JavaThread::jvmci_alternate_call_target_offset())));
-  __ bind(no_alternative_target);
+  if (EnableJVMCI) {
+    // check if this call should be routed towards a specific entry point
+    __ ld(t0, Address(xthread, in_bytes(JavaThread::jvmci_alternate_call_target_offset())));
+    Label no_alternative_target;
+    __ beqz(t0, no_alternative_target);
+    __ mv(t1, t0);
+    __ sd(zr, Address(xthread, in_bytes(JavaThread::jvmci_alternate_call_target_offset())));
+    __ bind(no_alternative_target);
+  }
 #endif // INCLUDE_JVMCI
 
   // Now generate the shuffle code.
@@ -2082,7 +2084,9 @@ void SharedRuntime::generate_deopt_blob() {
   // Setup code generation tools
   int pad = 0;
 #if INCLUDE_JVMCI
-  pad += 512; // Increase the buffer size for JVMCI
+  if (EnableJVMCI) {
+    pad += 512; // Increase the buffer size when compiling for JVMCI
+  }
 #endif
   const char* name = SharedRuntime::stub_name(SharedStubId::deopt_id);
   CodeBuffer buffer(name, 2048 + pad, 1024);
@@ -2154,33 +2158,38 @@ void SharedRuntime::generate_deopt_blob() {
 
 #if INCLUDE_JVMCI
   Label after_fetch_unroll_info_call;
-  int implicit_exception_uncommon_trap_offset = __ pc() - start;
+  int implicit_exception_uncommon_trap_offset = 0;
+  int uncommon_trap_offset = 0;
 
-  __ ld(ra, Address(xthread, in_bytes(JavaThread::jvmci_implicit_exception_pc_offset())));
-  __ sd(zr, Address(xthread, in_bytes(JavaThread::jvmci_implicit_exception_pc_offset())));
+  if (EnableJVMCI) {
+    implicit_exception_uncommon_trap_offset = __ pc() - start;
 
-  int uncommon_trap_offset = __ pc() - start;
+    __ ld(ra, Address(xthread, in_bytes(JavaThread::jvmci_implicit_exception_pc_offset())));
+    __ sd(zr, Address(xthread, in_bytes(JavaThread::jvmci_implicit_exception_pc_offset())));
 
-  // Save everything in sight.
-  reg_saver.save_live_registers(masm, 0, &frame_size_in_words);
-  // fetch_unroll_info needs to call last_java_frame()
-  Label retaddr;
-  __ set_last_Java_frame(sp, noreg, retaddr, t0);
+    uncommon_trap_offset = __ pc() - start;
+
+    // Save everything in sight.
+    reg_saver.save_live_registers(masm, 0, &frame_size_in_words);
+    // fetch_unroll_info needs to call last_java_frame()
+    Label retaddr;
+    __ set_last_Java_frame(sp, noreg, retaddr, t0);
 
-  __ lw(c_rarg1, Address(xthread, in_bytes(JavaThread::pending_deoptimization_offset())));
-  __ mv(t0, -1);
-  __ sw(t0, Address(xthread, in_bytes(JavaThread::pending_deoptimization_offset())));
+    __ lw(c_rarg1, Address(xthread, in_bytes(JavaThread::pending_deoptimization_offset())));
+    __ mv(t0, -1);
+    __ sw(t0, Address(xthread, in_bytes(JavaThread::pending_deoptimization_offset())));
 
-  __ mv(xcpool, Deoptimization::Unpack_reexecute);
-  __ mv(c_rarg0, xthread);
-  __ orrw(c_rarg2, zr, xcpool); // exec mode
-  __ rt_call(CAST_FROM_FN_PTR(address, Deoptimization::uncommon_trap));
-  __ bind(retaddr);
-  oop_maps->add_gc_map( __ pc()-start, map->deep_copy());
+    __ mv(xcpool, Deoptimization::Unpack_reexecute);
+    __ mv(c_rarg0, xthread);
+    __ orrw(c_rarg2, zr, xcpool); // exec mode
+    __ rt_call(CAST_FROM_FN_PTR(address, Deoptimization::uncommon_trap));
+    __ bind(retaddr);
+    oop_maps->add_gc_map( __ pc()-start, map->deep_copy());
 
-  __ reset_last_Java_frame(false);
+    __ reset_last_Java_frame(false);
 
-  __ j(after_fetch_unroll_info_call);
+    __ j(after_fetch_unroll_info_call);
+  } // EnableJVMCI
 #endif // INCLUDE_JVMCI
 
   int exception_offset = __ pc() - start;
@@ -2275,7 +2284,9 @@ void SharedRuntime::generate_deopt_blob() {
   __ reset_last_Java_frame(false);
 
 #if INCLUDE_JVMCI
-  __ bind(after_fetch_unroll_info_call);
+  if (EnableJVMCI) {
+    __ bind(after_fetch_unroll_info_call);
+  }
 #endif
 
   // Load UnrollBlock* into x15
@@ -2432,8 +2443,10 @@ void SharedRuntime::generate_deopt_blob() {
   assert(_deopt_blob != nullptr, "create deoptimization blob fail!");
   _deopt_blob->set_unpack_with_exception_in_tls_offset(exception_in_tls_offset);
 #if INCLUDE_JVMCI
-  _deopt_blob->set_uncommon_trap_offset(uncommon_trap_offset);
-  _deopt_blob->set_implicit_exception_uncommon_trap_offset(implicit_exception_uncommon_trap_offset);
+  if (EnableJVMCI) {
+    _deopt_blob->set_uncommon_trap_offset(uncommon_trap_offset);
+    _deopt_blob->set_implicit_exception_uncommon_trap_offset(implicit_exception_uncommon_trap_offset);
+  }
 #endif
 }
 

src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp

@@ -936,13 +936,15 @@ void SharedRuntime::gen_i2c_adapter(MacroAssembler *masm,
   __ movptr(r11, Address(rbx, in_bytes(Method::from_compiled_offset())));
 
 #if INCLUDE_JVMCI
-  // check if this call should be routed towards a specific entry point
-  __ cmpptr(Address(r15_thread, in_bytes(JavaThread::jvmci_alternate_call_target_offset())), 0);
-  Label no_alternative_target;
-  __ jcc(Assembler::equal, no_alternative_target);
-  __ movptr(r11, Address(r15_thread, in_bytes(JavaThread::jvmci_alternate_call_target_offset())));
-  __ movptr(Address(r15_thread, in_bytes(JavaThread::jvmci_alternate_call_target_offset())), 0);
-  __ bind(no_alternative_target);
+  if (EnableJVMCI) {
+    // check if this call should be routed towards a specific entry point
+    __ cmpptr(Address(r15_thread, in_bytes(JavaThread::jvmci_alternate_call_target_offset())), 0);
+    Label no_alternative_target;
+    __ jcc(Assembler::equal, no_alternative_target);
+    __ movptr(r11, Address(r15_thread, in_bytes(JavaThread::jvmci_alternate_call_target_offset())));
+    __ movptr(Address(r15_thread, in_bytes(JavaThread::jvmci_alternate_call_target_offset())), 0);
+    __ bind(no_alternative_target);
+  }
 #endif // INCLUDE_JVMCI
 
   // Now generate the shuffle code.  Pick up all register args and move the
@@ -2641,7 +2643,9 @@ void SharedRuntime::generate_deopt_blob() {
     pad += 1024;
   }
 #if INCLUDE_JVMCI
-  pad += 512; // Increase the buffer size for JVMCI
+  if (EnableJVMCI) {
+    pad += 512; // Increase the buffer size when compiling for JVMCI
+  }
 #endif
   const char* name = SharedRuntime::stub_name(SharedStubId::deopt_id);
   CodeBuffer buffer(name, 2560+pad, 1024);
@@ -2711,30 +2715,35 @@ void SharedRuntime::generate_deopt_blob() {
 
 #if INCLUDE_JVMCI
   Label after_fetch_unroll_info_call;
-  int implicit_exception_uncommon_trap_offset = __ pc() - start;
+  int implicit_exception_uncommon_trap_offset = 0;
+  int uncommon_trap_offset = 0;
 
-  __ pushptr(Address(r15_thread, in_bytes(JavaThread::jvmci_implicit_exception_pc_offset())));
-  __ movptr(Address(r15_thread, in_bytes(JavaThread::jvmci_implicit_exception_pc_offset())), NULL_WORD);
+  if (EnableJVMCI) {
+    implicit_exception_uncommon_trap_offset = __ pc() - start;
 
-  int uncommon_trap_offset = __ pc() - start;
+    __ pushptr(Address(r15_thread, in_bytes(JavaThread::jvmci_implicit_exception_pc_offset())));
+    __ movptr(Address(r15_thread, in_bytes(JavaThread::jvmci_implicit_exception_pc_offset())), NULL_WORD);
 
-  // Save everything in sight.
-  RegisterSaver::save_live_registers(masm, 0, &frame_size_in_words, /*save_wide_vectors*/ true);
-  // fetch_unroll_info needs to call last_java_frame()
-  __ set_last_Java_frame(noreg, noreg, nullptr, rscratch1);
+    uncommon_trap_offset = __ pc() - start;
 
-  __ movl(c_rarg1, Address(r15_thread, in_bytes(JavaThread::pending_deoptimization_offset())));
-  __ movl(Address(r15_thread, in_bytes(JavaThread::pending_deoptimization_offset())), -1);
+    // Save everything in sight.
+    RegisterSaver::save_live_registers(masm, 0, &frame_size_in_words, /*save_wide_vectors*/ true);
+    // fetch_unroll_info needs to call last_java_frame()
+    __ set_last_Java_frame(noreg, noreg, nullptr, rscratch1);
 
-  __ movl(r14, Deoptimization::Unpack_reexecute);
-  __ mov(c_rarg0, r15_thread);
-  __ movl(c_rarg2, r14); // exec mode
-  __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, Deoptimization::uncommon_trap)));
-  oop_maps->add_gc_map( __ pc()-start, map->deep_copy());
+    __ movl(c_rarg1, Address(r15_thread, in_bytes(JavaThread::pending_deoptimization_offset())));
+    __ movl(Address(r15_thread, in_bytes(JavaThread::pending_deoptimization_offset())), -1);
 
-  __ reset_last_Java_frame(false);
+    __ movl(r14, Deoptimization::Unpack_reexecute);
+    __ mov(c_rarg0, r15_thread);
+    __ movl(c_rarg2, r14); // exec mode
+    __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, Deoptimization::uncommon_trap)));
+    oop_maps->add_gc_map( __ pc()-start, map->deep_copy());
+
+    __ reset_last_Java_frame(false);
 
-  __ jmp(after_fetch_unroll_info_call);
+    __ jmp(after_fetch_unroll_info_call);
+  } // EnableJVMCI
 #endif // INCLUDE_JVMCI
 
   int exception_offset = __ pc() - start;
@@ -2822,7 +2831,9 @@ void SharedRuntime::generate_deopt_blob() {
   __ reset_last_Java_frame(false);
 
 #if INCLUDE_JVMCI
-  __ bind(after_fetch_unroll_info_call);
+  if (EnableJVMCI) {
+    __ bind(after_fetch_unroll_info_call);
+  }
 #endif
 
   // Load UnrollBlock* into rdi
@@ -2983,8 +2994,10 @@ void SharedRuntime::generate_deopt_blob() {
   _deopt_blob = DeoptimizationBlob::create(&buffer, oop_maps, 0, exception_offset, reexecute_offset, frame_size_in_words);
   _deopt_blob->set_unpack_with_exception_in_tls_offset(exception_in_tls_offset);
 #if INCLUDE_JVMCI
-  _deopt_blob->set_uncommon_trap_offset(uncommon_trap_offset);
-  _deopt_blob->set_implicit_exception_uncommon_trap_offset(implicit_exception_uncommon_trap_offset);
+  if (EnableJVMCI) {
+    _deopt_blob->set_uncommon_trap_offset(uncommon_trap_offset);
+    _deopt_blob->set_implicit_exception_uncommon_trap_offset(implicit_exception_uncommon_trap_offset);
+  }
 #endif
 }
 

src/hotspot/cpu/x86/templateInterpreterGenerator_x86.cpp

@@ -227,7 +227,7 @@ address TemplateInterpreterGenerator::generate_deopt_entry_for(TosState state, i
 #if INCLUDE_JVMCI
   // Check if we need to take lock at entry of synchronized method.  This can
   // only occur on method entry so emit it only for vtos with step 0.
-  if (state == vtos && step == 0) {
+  if (EnableJVMCI && state == vtos && step == 0) {
     Label L;
     __ cmpb(Address(thread, JavaThread::pending_monitorenter_offset()), 0);
     __ jcc(Assembler::zero, L);
@@ -240,11 +240,13 @@ address TemplateInterpreterGenerator::generate_deopt_entry_for(TosState state, i
     __ bind(L);
   } else {
 #ifdef ASSERT
-    Label L;
-    __ cmpb(Address(r15_thread, JavaThread::pending_monitorenter_offset()), 0);
-    __ jcc(Assembler::zero, L);
-    __ stop("unexpected pending monitor in deopt entry");
-    __ bind(L);
+    if (EnableJVMCI) {
+      Label L;
+      __ cmpb(Address(r15_thread, JavaThread::pending_monitorenter_offset()), 0);
+      __ jcc(Assembler::zero, L);
+      __ stop("unexpected pending monitor in deopt entry");
+      __ bind(L);
+    }
 #endif
   }
 #endif