[vectorIntrinsics] RFR: Merge panama-vector:master

Ningsheng Jian njian at openjdk.java.net
Tue Apr 6 03:31:30 UTC 2021


On Mon, 5 Apr 2021 23:35:40 GMT, Sandhya Viswanathan <sviswanathan at openjdk.org> wrote:

> @nsjian Need your help to merge test/hotspot/gtest/aarch64/asmtest.out.h (I have left the git merge markers in place for asmtest.out.h).

Thanks for the merge work. I have sent the correct files to you. There are two merge issues in aarch64_neon_ad.m4 and aarch64_neon.ad, otherwise looks good to me.

src/hotspot/cpu/aarch64/aarch64_neon.ad line 75:

> 73:   ins_encode( aarch64_enc_ldrvQ(dst, mem) );
> 74:   ins_pipe(vload_reg_mem128);
> 75: %}

Since these rules have been moved to here in jdk/master, we need to remove the lines L3766-L3830 to avoid duplicate. And also the aarch64_neon_ad.m4 L1504-L1511.

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

Marked as reviewed by njian (Committer).

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


More information about the panama-dev mailing list