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

[Jatin Bhateja]

On Thu, 19 Aug 2021 03:35:19 GMT, Jatin Bhateja <jbhateja at openjdk.org> wrote:

> Following two files have merge conflicts
> - src/hotspot/cpu/aarch64/aarch64_sve_ad.m4
> - src/hotspot/cpu/aarch64/aarch64_sve.ad
> 
> @nsjian, @theRealELiu , @XiaohongGong 
> Can you kindly resolve the conflicts.
> 
> Thanks

> > Following two files have merge conflicts
> > 
> > * src/hotspot/cpu/aarch64/aarch64_sve_ad.m4
> > * src/hotspot/cpu/aarch64/aarch64_sve.ad
> > 
> > @nsjian, @theRealELiu , @XiaohongGong
> > Can you kindly resolve the conflicts.
> 
> This is the commit on top of your code, with conflicts resolved.
> 
> [nsjian at c01c135](https://github.com/nsjian/panama-vector/commit/c01c135c66bc2cc5d867d3ee233029365b08c59d)

Thanks @nsjina, conflicts merged.

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

PR: https://git.openjdk.java.net/panama-vector/pull/112