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

Jatin Bhateja jbhateja at openjdk.java.net
Thu Aug 19 03:42:18 UTC 2021


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

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

Commit messages:
 - Merge branch 'vectorIntrinsics' of http://github.com/openjdk/panama-vector into merge-vectorIntrinsics
 - Merge panama-vector:master
 - 8272297: FileInputStream should override transferTo() for better performance
 - 8271471: [IR Framework] Rare occurrence of "<!-- safepoint while printing -->" in PrintIdeal/PrintOptoAssembly can let tests fail
 - 8272231: G1: Refactor G1CardSet::get_card_set to return G1CardSetHashTableValue*
 - 8267833: Improve G1CardSetInlinePtr::add()
 - 8272235: G1: update outdated code root fixup
 - 8272158: SoftReference related bugs under memory pressure
 - 8272439: G1: add documentation to G1CardSetInlinePtr
 - 8272461: G1: remove empty declaration of cleanup_after_scan_heap_roots
 - ... and 327 more: https://git.openjdk.java.net/panama-vector/compare/bf5918da...167bf305

The webrevs contain the adjustments done while merging with regards to each parent branch:
 - vectorIntrinsics+mask: https://webrevs.openjdk.java.net/?repo=panama-vector&pr=112&range=00.0
 - panama-vector:vectorIntrinsics: https://webrevs.openjdk.java.net/?repo=panama-vector&pr=112&range=00.1

Changes: https://git.openjdk.java.net/panama-vector/pull/112/files
  Stats: 63262 lines in 1090 files changed: 53193 ins; 4850 del; 5219 mod
  Patch: https://git.openjdk.java.net/panama-vector/pull/112.diff
  Fetch: git fetch https://git.openjdk.java.net/panama-vector pull/112/head:pull/112

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


More information about the panama-dev mailing list