[vectorInstrinsics] merge with upstream failed

[Vladimir Ivanov]

I did the manual merge, but then noticed 3 test failures:

FAILED: jdk/incubator/vector/Float64VectorTests.java
FAILED: jdk/incubator/vector/Long128VectorTests.java
FAILED: jdk/incubator/vector/Long256VectorTests.java

Haven't checked whether they are new or not. Will push the merge tomorrow.

Best regards,
Vladimir Ivanov

On 05/07/2018 21:12, Paul Sandoz wrote:
> Thanks for the notice.
> 
> I think most if not all of the conflict is associated with the base64 intrinsic that was recently pushed:
> 
>    https://bugs.openjdk.java.net/browse/JDK-8205528 <https://bugs.openjdk.java.net/browse/JDK-8205528>
>    http://hg.openjdk.java.net/jdk/jdk/rev/480a96a43b62 <http://hg.openjdk.java.net/jdk/jdk/rev/480a96a43b62>
> 
> I am not qualified to merge this and there might be some architectural issues that need to be resolved regarding the use of vector registers for indexing (re: rearrangement using a Shuffle).
> 
> Paul.
> 
>> On Jul 5, 2018, at 4:04 AM, Maurizio Cimadamore <maurizio.cimadamore at oracle.com> wrote:
>>
>> Hi,
>> the vectorIntrinsics branch failed to merge because of conflicts in assembler_x86.cpp. I tried to look at these, but there seem to be conflicting changes for vector instructions coming from upstream JDK and I was unsure on how to resolve them. I think it's best if people working on this branch take a look at this. To start a merge:
>>
>> $ hg update vectorIntrinsics
>>
>> $ hg merge -r default
>>
>> <do merge>
>>
>> $ hg commit -m 'manual merge with default'
>>
>> $ hg push
>>
>> Cheers
>> Maurizio
>>
>