src/hotspot/cpu/aarch64/gc/shenandoah/shenandoah_aarch64.ad

rev 53513 : 8217016: Shenandoah: Streamline generation of CAS barriers

*** 24,49 ****
  source_hpp %{
  #include "gc/shenandoah/shenandoahBarrierSetAssembler.hpp"
  %}
  
  encode %{
!   enc_class aarch64_enc_cmpxchg_oop_shenandoah(memory mem, iRegP oldval, iRegP newval, iRegPNoSp tmp) %{
      MacroAssembler _masm(&cbuf);
      guarantee($mem$$index == -1 && $mem$$disp == 0, "impossible encoding");
      Register tmp = $tmp$$Register;
      __ mov(tmp, $oldval$$Register); // Must not clobber oldval.
      ShenandoahBarrierSet::assembler()->cmpxchg_oop(&_masm, $mem$$Register, tmp, $newval$$Register,
!                                                    /*acquire*/ false, /*release*/ true, /*weak*/ false, /*encode*/ false, noreg, noreg);
    %}
  
!   enc_class aarch64_enc_cmpxchg_acq_oop_shenandoah(memory mem, iRegP oldval, iRegP newval, iRegPNoSp tmp) %{
      MacroAssembler _masm(&cbuf);
      guarantee($mem$$index == -1 && $mem$$disp == 0, "impossible encoding");
      Register tmp = $tmp$$Register;
      __ mov(tmp, $oldval$$Register); // Must not clobber oldval.
      ShenandoahBarrierSet::assembler()->cmpxchg_oop(&_masm, $mem$$Register, tmp, $newval$$Register,
!                                                    /*acquire*/ true, /*release*/ true, /*weak*/ false, /*encode*/ false, noreg, noreg);
    %}
  %}
  
  instruct shenandoahRB(iRegPNoSp dst, iRegP src, rFlagsReg cr) %{
    match(Set dst (ShenandoahReadBarrier src));
--- 24,49 ----
  source_hpp %{
  #include "gc/shenandoah/shenandoahBarrierSetAssembler.hpp"
  %}
  
  encode %{
!   enc_class aarch64_enc_cmpxchg_oop_shenandoah(memory mem, iRegP oldval, iRegP newval, iRegPNoSp tmp, iRegINoSp res) %{
      MacroAssembler _masm(&cbuf);
      guarantee($mem$$index == -1 && $mem$$disp == 0, "impossible encoding");
      Register tmp = $tmp$$Register;
      __ mov(tmp, $oldval$$Register); // Must not clobber oldval.
      ShenandoahBarrierSet::assembler()->cmpxchg_oop(&_masm, $mem$$Register, tmp, $newval$$Register,
!                                                    /*acquire*/ false, /*release*/ true, /*weak*/ false, /*is_cae*/ false, $res$$Register);
    %}
  
!   enc_class aarch64_enc_cmpxchg_acq_oop_shenandoah(memory mem, iRegP oldval, iRegP newval, iRegPNoSp tmp, iRegINoSp res) %{
      MacroAssembler _masm(&cbuf);
      guarantee($mem$$index == -1 && $mem$$disp == 0, "impossible encoding");
      Register tmp = $tmp$$Register;
      __ mov(tmp, $oldval$$Register); // Must not clobber oldval.
      ShenandoahBarrierSet::assembler()->cmpxchg_oop(&_masm, $mem$$Register, tmp, $newval$$Register,
!                                                    /*acquire*/ true, /*release*/ true, /*weak*/ false, /*is_cae*/ false, $res$$Register);
    %}
  %}
  
  instruct shenandoahRB(iRegPNoSp dst, iRegP src, rFlagsReg cr) %{
    match(Set dst (ShenandoahReadBarrier src));
*** 64,78 ****
  
    effect(TEMP tmp, KILL cr);
  
    format %{
      "cmpxchg_shenandoah $mem, $oldval, $newval\t# (ptr) if $mem == $oldval then $mem <-- $newval with temp $tmp"
-     "cset $res, EQ\t# $res <-- (EQ ? 1 : 0)"
    %}
  
!   ins_encode(aarch64_enc_cmpxchg_oop_shenandoah(mem, oldval, newval, tmp),
!              aarch64_enc_cset_eq(res));
  
    ins_pipe(pipe_slow);
  %}
  
  instruct compareAndSwapN_shenandoah(iRegINoSp res, indirect mem, iRegN oldval, iRegN newval, iRegNNoSp tmp, rFlagsReg cr) %{
--- 64,76 ----
  
    effect(TEMP tmp, KILL cr);
  
    format %{
      "cmpxchg_shenandoah $mem, $oldval, $newval\t# (ptr) if $mem == $oldval then $mem <-- $newval with temp $tmp"
    %}
  
!   ins_encode(aarch64_enc_cmpxchg_oop_shenandoah(mem, oldval, newval, tmp, res));
  
    ins_pipe(pipe_slow);
  %}
  
  instruct compareAndSwapN_shenandoah(iRegINoSp res, indirect mem, iRegN oldval, iRegN newval, iRegNNoSp tmp, rFlagsReg cr) %{
*** 82,99 ****
  
    effect(TEMP tmp, KILL cr);
  
    format %{
      "cmpxchgw_shenandoah $mem, $oldval, $newval\t# (ptr) if $mem == $oldval then $mem <-- $newval with temp $tmp"
-     "cset $res, EQ\t# $res <-- (EQ ? 1 : 0)"
    %}
  
    ins_encode %{
      Register tmp = $tmp$$Register;
      __ mov(tmp, $oldval$$Register); // Must not clobber oldval.
!     ShenandoahBarrierSet::assembler()->cmpxchg_oop(&_masm, $mem$$Register, tmp, $newval$$Register, /*acquire*/ false, /*release*/ true, /*weak*/ false, /*encode*/ false, noreg, noreg);
!     __ cset($res$$Register, Assembler::EQ);
    %}
  
    ins_pipe(pipe_slow);
  %}
  
--- 80,95 ----
  
    effect(TEMP tmp, KILL cr);
  
    format %{
      "cmpxchgw_shenandoah $mem, $oldval, $newval\t# (ptr) if $mem == $oldval then $mem <-- $newval with temp $tmp"
    %}
  
    ins_encode %{
      Register tmp = $tmp$$Register;
      __ mov(tmp, $oldval$$Register); // Must not clobber oldval.
!     ShenandoahBarrierSet::assembler()->cmpxchg_oop(&_masm, $mem$$Register, tmp, $newval$$Register, /*acquire*/ false, /*release*/ true, /*weak*/ false, /*is_cae*/ false, $res$$Register);
    %}
  
    ins_pipe(pipe_slow);
  %}
  
*** 105,119 ****
  
    effect(TEMP tmp, KILL cr);
  
    format %{
      "cmpxchg_acq_shenandoah_oop $mem, $oldval, $newval\t# (ptr) if $mem == $oldval then $mem <-- $newval with temp $tmp"
-     "cset $res, EQ\t# $res <-- (EQ ? 1 : 0)"
    %}
  
!   ins_encode(aarch64_enc_cmpxchg_acq_oop_shenandoah(mem, oldval, newval, tmp),
!              aarch64_enc_cset_eq(res));
  
    ins_pipe(pipe_slow);
  %}
  
  instruct compareAndSwapNAcq_shenandoah(iRegINoSp res, indirect mem, iRegN oldval, iRegN newval, iRegNNoSp tmp, rFlagsReg cr) %{
--- 101,113 ----
  
    effect(TEMP tmp, KILL cr);
  
    format %{
      "cmpxchg_acq_shenandoah_oop $mem, $oldval, $newval\t# (ptr) if $mem == $oldval then $mem <-- $newval with temp $tmp"
    %}
  
!   ins_encode(aarch64_enc_cmpxchg_acq_oop_shenandoah(mem, oldval, newval, tmp, res));
  
    ins_pipe(pipe_slow);
  %}
  
  instruct compareAndSwapNAcq_shenandoah(iRegINoSp res, indirect mem, iRegN oldval, iRegN newval, iRegNNoSp tmp, rFlagsReg cr) %{
*** 124,141 ****
  
    effect(TEMP tmp, KILL cr);
  
   format %{
      "cmpxchgw_acq_shenandoah_narrow_oop $mem, $oldval, $newval\t# (ptr) if $mem == $oldval then $mem <-- $newval with temp $tmp"
-     "cset $res, EQ\t# $res <-- (EQ ? 1 : 0)"
   %}
  
    ins_encode %{
      Register tmp = $tmp$$Register;
      __ mov(tmp, $oldval$$Register); // Must not clobber oldval.
!     ShenandoahBarrierSet::assembler()->cmpxchg_oop(&_masm, $mem$$Register, tmp, $newval$$Register, /*acquire*/ true, /*release*/ true, /*weak*/ false, /*encode*/ false, noreg, noreg);
!     __ cset($res$$Register, Assembler::EQ);
    %}
  
    ins_pipe(pipe_slow);
  %}
  
--- 118,133 ----
  
    effect(TEMP tmp, KILL cr);
  
   format %{
      "cmpxchgw_acq_shenandoah_narrow_oop $mem, $oldval, $newval\t# (ptr) if $mem == $oldval then $mem <-- $newval with temp $tmp"
   %}
  
    ins_encode %{
      Register tmp = $tmp$$Register;
      __ mov(tmp, $oldval$$Register); // Must not clobber oldval.
!     ShenandoahBarrierSet::assembler()->cmpxchg_oop(&_masm, $mem$$Register, tmp, $newval$$Register, /*acquire*/ true, /*release*/ true, /*weak*/ false, /*is_cae*/ false, $res$$Register);
    %}
  
    ins_pipe(pipe_slow);
  %}
  
*** 148,158 ****
    %}
    ins_encode %{
      Register tmp = $tmp$$Register;
      __ mov(tmp, $oldval$$Register); // Must not clobber oldval.
      ShenandoahBarrierSet::assembler()->cmpxchg_oop(&_masm, $mem$$Register, tmp, $newval$$Register,
!                                                    /*acquire*/ false, /*release*/ true, /*weak*/ false, /* encode*/ false, noreg, noreg, rscratch2, $res$$Register);
    %}
    ins_pipe(pipe_slow);
  %}
  
  instruct compareAndExchangeP_shenandoah(iRegPNoSp res, indirect mem, iRegP oldval, iRegP newval, iRegPNoSp tmp, rFlagsReg cr) %{
--- 140,150 ----
    %}
    ins_encode %{
      Register tmp = $tmp$$Register;
      __ mov(tmp, $oldval$$Register); // Must not clobber oldval.
      ShenandoahBarrierSet::assembler()->cmpxchg_oop(&_masm, $mem$$Register, tmp, $newval$$Register,
!                                                    /*acquire*/ false, /*release*/ true, /*weak*/ false, /*is_cae*/ true, $res$$Register);
    %}
    ins_pipe(pipe_slow);
  %}
  
  instruct compareAndExchangeP_shenandoah(iRegPNoSp res, indirect mem, iRegP oldval, iRegP newval, iRegPNoSp tmp, rFlagsReg cr) %{
*** 164,174 ****
    %}
    ins_encode %{
      Register tmp = $tmp$$Register;
      __ mov(tmp, $oldval$$Register); // Must not clobber oldval.
      ShenandoahBarrierSet::assembler()->cmpxchg_oop(&_masm, $mem$$Register, tmp, $newval$$Register,
!                                                    /*acquire*/ false, /*release*/ true, /*weak*/ false, /*encode*/ false, noreg, noreg, rscratch2, $res$$Register);
    %}
    ins_pipe(pipe_slow);
  %}
  
  instruct compareAndExchangeNAcq_shenandoah(iRegNNoSp res, indirect mem, iRegN oldval, iRegN newval, iRegNNoSp tmp, rFlagsReg cr) %{
--- 156,166 ----
    %}
    ins_encode %{
      Register tmp = $tmp$$Register;
      __ mov(tmp, $oldval$$Register); // Must not clobber oldval.
      ShenandoahBarrierSet::assembler()->cmpxchg_oop(&_masm, $mem$$Register, tmp, $newval$$Register,
!                                                    /*acquire*/ false, /*release*/ true, /*weak*/ false, /*is_cae*/ true, $res$$Register);
    %}
    ins_pipe(pipe_slow);
  %}
  
  instruct compareAndExchangeNAcq_shenandoah(iRegNNoSp res, indirect mem, iRegN oldval, iRegN newval, iRegNNoSp tmp, rFlagsReg cr) %{
*** 181,191 ****
    %}
    ins_encode %{
      Register tmp = $tmp$$Register;
      __ mov(tmp, $oldval$$Register); // Must not clobber oldval.
      ShenandoahBarrierSet::assembler()->cmpxchg_oop(&_masm, $mem$$Register, tmp, $newval$$Register,
!                                                    /*acquire*/ true, /*release*/ true, /*weak*/ false, /* encode*/ false, noreg, noreg, rscratch2, $res$$Register);
    %}
    ins_pipe(pipe_slow);
  %}
  
  instruct compareAndExchangePAcq_shenandoah(iRegPNoSp res, indirect mem, iRegP oldval, iRegP newval, iRegPNoSp tmp, rFlagsReg cr) %{
--- 173,183 ----
    %}
    ins_encode %{
      Register tmp = $tmp$$Register;
      __ mov(tmp, $oldval$$Register); // Must not clobber oldval.
      ShenandoahBarrierSet::assembler()->cmpxchg_oop(&_masm, $mem$$Register, tmp, $newval$$Register,
!                                                    /*acquire*/ true, /*release*/ true, /*weak*/ false, /*is_cae*/ true, $res$$Register);
    %}
    ins_pipe(pipe_slow);
  %}
  
  instruct compareAndExchangePAcq_shenandoah(iRegPNoSp res, indirect mem, iRegP oldval, iRegP newval, iRegPNoSp tmp, rFlagsReg cr) %{
*** 198,208 ****
    %}
    ins_encode %{
      Register tmp = $tmp$$Register;
      __ mov(tmp, $oldval$$Register); // Must not clobber oldval.
      ShenandoahBarrierSet::assembler()->cmpxchg_oop(&_masm, $mem$$Register, tmp, $newval$$Register,
!                                                    /*acquire*/ true, /*release*/ true, /*weak*/ false, /*encode*/ false, noreg, noreg, rscratch2, $res$$Register);
    %}
    ins_pipe(pipe_slow);
  %}
  
  instruct weakCompareAndSwapN_shenandoah(iRegINoSp res, indirect mem, iRegN oldval, iRegN newval, iRegNNoSp tmp, rFlagsReg cr) %{
--- 190,200 ----
    %}
    ins_encode %{
      Register tmp = $tmp$$Register;
      __ mov(tmp, $oldval$$Register); // Must not clobber oldval.
      ShenandoahBarrierSet::assembler()->cmpxchg_oop(&_masm, $mem$$Register, tmp, $newval$$Register,
!                                                    /*acquire*/ true, /*release*/ true, /*weak*/ false, /*is_cae*/ true, $res$$Register);
    %}
    ins_pipe(pipe_slow);
  %}
  
  instruct weakCompareAndSwapN_shenandoah(iRegINoSp res, indirect mem, iRegN oldval, iRegN newval, iRegNNoSp tmp, rFlagsReg cr) %{
*** 215,244 ****
    %}
    ins_encode %{
      Register tmp = $tmp$$Register;
      __ mov(tmp, $oldval$$Register); // Must not clobber oldval.
      ShenandoahBarrierSet::assembler()->cmpxchg_oop(&_masm, $mem$$Register, tmp, $newval$$Register,
!                                                    /*acquire*/ false, /*release*/ true, /*weak*/ true, /*encode*/ false, noreg, noreg);
!     __ csetw($res$$Register, Assembler::EQ);
    %}
    ins_pipe(pipe_slow);
  %}
  
  instruct weakCompareAndSwapP_shenandoah(iRegINoSp res, indirect mem, iRegP oldval, iRegP newval, iRegPNoSp tmp, rFlagsReg cr) %{
    match(Set res (ShenandoahWeakCompareAndSwapP mem (Binary oldval newval)));
    ins_cost(2 * VOLATILE_REF_COST);
    effect(TEMP tmp, KILL cr);
    format %{
      "cmpxchg_shenandoah $res = $mem, $oldval, $newval\t# (ptr, weak) if $mem == $oldval then $mem <-- $newval"
-     "csetw $res, EQ\t# $res <-- (EQ ? 1 : 0)"
    %}
    ins_encode %{
      Register tmp = $tmp$$Register;
      __ mov(tmp, $oldval$$Register); // Must not clobber oldval.
      ShenandoahBarrierSet::assembler()->cmpxchg_oop(&_masm, $mem$$Register, tmp, $newval$$Register,
!                                                    /*acquire*/ false, /*release*/ true, /*weak*/ true, /*encode*/ false, noreg, noreg);
!     __ csetw($res$$Register, Assembler::EQ);
    %}
    ins_pipe(pipe_slow);
  %}
  
  instruct weakCompareAndSwapNAcq_shenandoah(iRegINoSp res, indirect mem, iRegN oldval, iRegN newval, iRegNNoSp tmp, rFlagsReg cr) %{
--- 207,233 ----
    %}
    ins_encode %{
      Register tmp = $tmp$$Register;
      __ mov(tmp, $oldval$$Register); // Must not clobber oldval.
      ShenandoahBarrierSet::assembler()->cmpxchg_oop(&_masm, $mem$$Register, tmp, $newval$$Register,
!                                                    /*acquire*/ false, /*release*/ true, /*weak*/ true, /*is_cae*/ false, $res$$Register);
    %}
    ins_pipe(pipe_slow);
  %}
  
  instruct weakCompareAndSwapP_shenandoah(iRegINoSp res, indirect mem, iRegP oldval, iRegP newval, iRegPNoSp tmp, rFlagsReg cr) %{
    match(Set res (ShenandoahWeakCompareAndSwapP mem (Binary oldval newval)));
    ins_cost(2 * VOLATILE_REF_COST);
    effect(TEMP tmp, KILL cr);
    format %{
      "cmpxchg_shenandoah $res = $mem, $oldval, $newval\t# (ptr, weak) if $mem == $oldval then $mem <-- $newval"
    %}
    ins_encode %{
      Register tmp = $tmp$$Register;
      __ mov(tmp, $oldval$$Register); // Must not clobber oldval.
      ShenandoahBarrierSet::assembler()->cmpxchg_oop(&_masm, $mem$$Register, tmp, $newval$$Register,
!                                                    /*acquire*/ false, /*release*/ true, /*weak*/ true, /*is_cae*/ false, $res$$Register);
    %}
    ins_pipe(pipe_slow);
  %}
  
  instruct weakCompareAndSwapNAcq_shenandoah(iRegINoSp res, indirect mem, iRegN oldval, iRegN newval, iRegNNoSp tmp, rFlagsReg cr) %{
*** 252,263 ****
    %}
    ins_encode %{
      Register tmp = $tmp$$Register;
      __ mov(tmp, $oldval$$Register); // Must not clobber oldval.
      ShenandoahBarrierSet::assembler()->cmpxchg_oop(&_masm, $mem$$Register, tmp, $newval$$Register,
!                                                    /*acquire*/ true, /*release*/ true, /*weak*/ true, /*encode*/ false, noreg, noreg);
!     __ csetw($res$$Register, Assembler::EQ);
    %}
    ins_pipe(pipe_slow);
  %}
  
  instruct weakCompareAndSwapPAcq_shenandoah(iRegINoSp res, indirect mem, iRegP oldval, iRegP newval, iRegPNoSp tmp, rFlagsReg cr) %{
--- 241,251 ----
    %}
    ins_encode %{
      Register tmp = $tmp$$Register;
      __ mov(tmp, $oldval$$Register); // Must not clobber oldval.
      ShenandoahBarrierSet::assembler()->cmpxchg_oop(&_masm, $mem$$Register, tmp, $newval$$Register,
!                                                    /*acquire*/ true, /*release*/ true, /*weak*/ true, /*is_cae*/ false, $res$$Register);
    %}
    ins_pipe(pipe_slow);
  %}
  
  instruct weakCompareAndSwapPAcq_shenandoah(iRegINoSp res, indirect mem, iRegP oldval, iRegP newval, iRegPNoSp tmp, rFlagsReg cr) %{
*** 271,281 ****
    %}
    ins_encode %{
      Register tmp = $tmp$$Register;
      __ mov(tmp, $oldval$$Register); // Must not clobber oldval.
      ShenandoahBarrierSet::assembler()->cmpxchg_oop(&_masm, $mem$$Register, tmp, $newval$$Register,
!                                                    /*acquire*/ true, /*release*/ true, /*weak*/ true, /*encode*/ false, noreg, noreg);
!     __ csetw($res$$Register, Assembler::EQ);
    %}
    ins_pipe(pipe_slow);
  %}
- 
--- 259,267 ----
    %}
    ins_encode %{
      Register tmp = $tmp$$Register;
      __ mov(tmp, $oldval$$Register); // Must not clobber oldval.
      ShenandoahBarrierSet::assembler()->cmpxchg_oop(&_masm, $mem$$Register, tmp, $newval$$Register,
!                                                    /*acquire*/ true, /*release*/ true, /*weak*/ true, /*is_cae*/ false, $res$$Register);
    %}
    ins_pipe(pipe_slow);
  %}