[vectorIntrinsics+fp16] RFR: Merge panama-vector:vectorIntrinsics

[Bhavana Kilambi]

On Tue, 23 May 2023 10:54:23 GMT, Bhavana Kilambi <bkilambi at openjdk.org> wrote:

> Merges panama-vector:vectorIntrinsics into panama-vector:vectorInstrinsics+fp16 branch.
>     
>     Resolved merge conflicts in the following files -
>     
>             src/hotspot/cpu/x86/assembler_x86.hpp
>             src/hotspot/cpu/x86/macroAssembler_x86.cpp
>             src/hotspot/cpu/x86/stubGenerator_x86_64.cpp
>             src/hotspot/cpu/x86/stubRoutines_x86.cpp
>             src/hotspot/cpu/x86/vm_version_x86.cpp
>             src/hotspot/cpu/x86/vm_version_x86.hpp
>             src/hotspot/share/opto/classes.hpp
>             src/hotspot/share/opto/convertnode.hpp
>             src/hotspot/share/opto/vectorIntrinsics.cpp
>             src/hotspot/share/opto/vectornode.cpp
>             src/hotspot/share/opto/vectornode.hpp
>             src/java.base/share/classes/java/lang/Float.java
>             src/jdk.incubator.vector/share/classes/jdk/incubator/vector/LaneType.java
>             src/jdk.incubator.vector/share/classes/jdk/incubator/vector/X-Vector.java.template
>             src/jdk.incubator.vector/share/classes/jdk/incubator/vector/X-VectorBits.java.template
>             test/jdk/jdk/incubator/vector/templates/X-LoadStoreTest.java.template
>     
>     In addition to resolving the above merge conflicts, some parts of the
>     JDK code were also changed (to resolve JDK build errors and also to fix
>     some JTREG test errors). Listing them out below for easier review -
>     
>     1. Modified the logic for a couple of assertions in [1] and [2] to
>     incorporate checks for the Halffloat type as well <Build error without
>     this change>
>     
>     2. Modified the definition of ELEMENT_LAYOUT in [3] to consider
>     Short type for Halffloat <Build error without this change>
>     
>     3. In [4] - LayoutType was added in commit [5] to enable using
>     "SHORT" type for Halffloat but after the above modification #2, we do not
>     need this variable anymore <Dead variable, not needed anymore>
>     
>     4. Removed an extra AddVHF node declaration in [6] <JTREG error without
>     this change>
>     
>     5. Fixed evfmadd231ph function by modifying - emit_operand() here - [7]
>     <JDK build error without this change>
>     
>     6.Removed these rules in Matcher::match_rule_supported_vector() - [8]
>     <JTREG errors without this change>
>     
>     7. Added AVX512_FP16 flag to - [9] <JTREG errors without this change>
>     
>     8. Modified the rules for IR verification for x86 in - [10] <JTREG
>     errors without this change>
> 
> [1] https://github.com/openjd...

Hi @sviswa7 could you please help review this merge patch (especially the Intel specific changes)? We are planning on adding some aarch64 related patches on the fp16 branch on top of this merge (so that we get the latest *ad files for aarch64) and it would be really helpful if you could take a look at it. Thank you!

-------------

PR Comment: https://git.openjdk.org/panama-vector/pull/216#issuecomment-1561448173