RFR: JDK-8222926: Unify cpu related part of shenandoahBarrierSetC1 and fix build when compiler1 is disabled

[Ao Qi]

On Wed, May 8, 2019 at 5:40 PM Aleksey Shipilev <shade at redhat.com> wrote:
>
> On 5/8/19 11:26 AM, Ao Qi wrote:
> > If we want to fix -compiler1 build without cobbling together x86 and
> > aarch64 code, I think one way is to put all of the code in
> > shenandoahBarrierSetC1_x86.cpp and shenandoahBarrierSetC1_aarch64.cpp
> > into #ifdef COMPILER1 ... #endif. What do you think about this method?
>
> That would be fine with me!
>
> Better yet, there are exclusion lists in JvmFeature.gmk:
>
>  ifeq ($(call check-jvm-feature, compiler1), true)
>   JVM_CFLAGS_FEATURES += -DCOMPILER1
> else
>   JVM_EXCLUDE_PATTERNS += c1_ c1/
> endif

Didn't know that. Thanks!

>
> So the fix might just amount to moving:
>  ./src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetC1_x86.cpp
>    ->
>  ./src/hotspot/cpu/x86/gc/shenandoah/c1/shenandoahBarrierSetC1_x86.cpp
>
> ...and
>  ./src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetC1_aarch64.cpp
>    ->
>  ./src/hotspot/cpu/aarch64/gc/shenandoah/c1/shenandoahBarrierSetC1_aarch64.cpp

Done that. Please see:

http://cr.openjdk.java.net/~aoqi/8222926/webrev.03/

I also updated https://bugs.openjdk.java.net/browse/JDK-8222926.

Tested:
build: linux-x86_64-{server, zero, minimal}-{release, fastdebug},
linux-aarch64-server-release
build (-compiler1): linux-x86_64-server-release, linux-aarch64-server-release
hotspot:tier1 linux-x86_64-server-{release,fastdebug}

Thanks,
Ao Qi

>
> -Aleksey
>