RFR (XS) 8223637: PPC64 and S390X build failures after 8223136 (Move compressed oops functions to CompressedOops class)

[Ao Qi]

On Fri, May 10, 2019 at 6:09 PM Schmidt, Lutz <lutz.schmidt at sap.com> wrote:
>
> OK, builds ran fine. No tests so far, except for a "java -version".
>
> Platforms: linuxaarch64, linuxpp64le, linuxx86_64, linuxs390x, rs6000_64
> Variants: fastdebug, release
>
> Linuxppc64 is still pending, my server is loaded with other stuff as well. As linuxppc64le went through smoothly, I do not expect issues to pop up.
>
> These changes need to be on top of Stefan's patch:
> --------------- 8< ----------------------
> diff -r b0fbe518d143 src/hotspot/cpu/ppc/macroAssembler_ppc.cpp
> --- a/src/hotspot/cpu/ppc/macroAssembler_ppc.cpp        Fri May 10 09:41:14 2019 +0200
> +++ b/src/hotspot/cpu/ppc/macroAssembler_ppc.cpp        Fri May 10 11:25:34 2019 +0200
> @@ -32,7 +32,6 @@
>  #include "interpreter/interpreter.hpp"
>  #include "memory/resourceArea.hpp"
>  #include "nativeInst_ppc.hpp"
> -#include "oops/compressedOops.hpp"
>  #include "prims/methodHandles.hpp"
>  #include "runtime/biasedLocking.hpp"
>  #include "runtime/icache.hpp"
> diff -r b0fbe518d143 src/hotspot/cpu/ppc/macroAssembler_ppc.inline.hpp
> --- a/src/hotspot/cpu/ppc/macroAssembler_ppc.inline.hpp Fri May 10 09:41:14 2019 +0200
> +++ b/src/hotspot/cpu/ppc/macroAssembler_ppc.inline.hpp Fri May 10 11:25:34 2019 +0200
> @@ -33,6 +33,7 @@
>  #include "gc/shared/barrierSet.hpp"
>  #include "gc/shared/barrierSetAssembler.hpp"
>  #include "oops/accessDecorators.hpp"
> +#include "oops/compressedOops.hpp"
>  #include "runtime/safepointMechanism.hpp"
>
>  inline bool MacroAssembler::is_ld_largeoffset(address a) {
> diff -r b0fbe518d143 src/hotspot/share/adlc/main.cpp
> --- a/src/hotspot/share/adlc/main.cpp   Fri May 10 09:41:14 2019 +0200
> +++ b/src/hotspot/share/adlc/main.cpp   Fri May 10 11:25:34 2019 +0200
> @@ -217,6 +217,7 @@
>    AD.addInclude(AD._CPP_file, "code/vmreg.inline.hpp");
>    AD.addInclude(AD._CPP_file, "gc/shared/collectedHeap.inline.hpp");
>    AD.addInclude(AD._CPP_file, "oops/compiledICHolder.hpp");
> +  AD.addInclude(AD._CPP_file, "oops/compressedOops.hpp");
>    AD.addInclude(AD._CPP_file, "oops/markOop.hpp");
>    AD.addInclude(AD._CPP_file, "oops/method.hpp");
>    AD.addInclude(AD._CPP_file, "oops/oop.inline.hpp");
> @@ -243,6 +244,7 @@
>    AD.addInclude(AD._CPP_CLONE_file, "adfiles", get_basename(AD._HPP_file._name));
>    AD.addInclude(AD._CPP_EXPAND_file, "precompiled.hpp");
>    AD.addInclude(AD._CPP_EXPAND_file, "adfiles", get_basename(AD._HPP_file._name));
> +  AD.addInclude(AD._CPP_EXPAND_file, "oops/compressedOops.hpp");
>    AD.addInclude(AD._CPP_FORMAT_file, "precompiled.hpp");
>    AD.addInclude(AD._CPP_FORMAT_file, "adfiles", get_basename(AD._HPP_file._name));
>    AD.addInclude(AD._CPP_GEN_file, "precompiled.hpp");
> @@ -257,6 +259,7 @@
>    AD.addInclude(AD._CPP_PIPELINE_file, "adfiles", get_basename(AD._HPP_file._name));
>    AD.addInclude(AD._DFA_file, "precompiled.hpp");
>    AD.addInclude(AD._DFA_file, "adfiles", get_basename(AD._HPP_file._name));
> +  AD.addInclude(AD._DFA_file, "oops/compressedOops.hpp");
>    AD.addInclude(AD._DFA_file, "opto/cfgnode.hpp");  // Use PROB_MAX in predicate.
>    AD.addInclude(AD._DFA_file, "opto/intrinsicnode.hpp");
>    AD.addInclude(AD._DFA_file, "opto/matcher.hpp");
> ----------- >8 ----------------------

Hi Lutz,

I filed JDK-8223653 and I am testing the fix. I guess your patch would
also fix JDK-8223653.

Thanks,
Ao Qi

>
> @Stefan, would you please proceed, extend and eventually push the patch?
>
> Thanks,
> Lutz
>
>
> On 10.05.19, 11:08, "Schmidt, Lutz" <lutz.schmidt at sap.com> wrote:
>
>     Hi all,
>
>     I'm currently collecting the changes required in addition to http://cr.openjdk.java.net/~stefank/8223637/webrev.01/
>
>     @shade: your fixes are necessary, but not sufficient. I would suggest we make Stefan's patch a superset of yours and push that. Is that ok for you?
>
>     Stay tuned, I see light at the end!
>     Lutz
>
>     On 10.05.19, 10:33, "hotspot-dev on behalf of Stefan Karlsson" <hotspot-dev-bounces at openjdk.java.net on behalf of stefan.karlsson at oracle.com> wrote:
>
>         Looks good.
>
>         FYI: We created a patch to fix this and the other platforms yesterday:
>         https://mail.openjdk.java.net/pipermail/hotspot-dev/2019-May/037998.html
>
>         When you're done with your patching, I'll see if anything is left to
>         push from that patch.
>
>         Thanks,
>         StefanK
>
>         On 2019-05-10 10:27, Aleksey Shipilev wrote:
>         > Bug:
>         >    https://bugs.openjdk.java.net/browse/JDK-8223637
>         >
>         > Fix:
>         >    http://cr.openjdk.java.net/~shade/8223637/webrev.01/
>         >
>         > This is hopefully the last build fix to make my CI stop screaming at me. Maybe SAP folks would like
>         > to confirm this fixes builds for them? If I am not responding later, feel free to reassign and push
>         > the fix without me.
>         >
>         > Testing: cross-compile without PCH to Linux ppc64 and s390x
>         >
>
>
>
>