[vectorInstrinsics] merge with upstream failed

[Viswanathan, Sandhya]

Hi Maurizio,

Builds after manual merge was ok. This could be due to the last change-set:

http://hg.openjdk.java.net/panama/dev/rev/9d5b8130187b

We will take a look.

Best Regards,
Sandhya


From: Maurizio Cimadamore [mailto:maurizio.cimadamore at oracle.com]
Sent: Wednesday, October 03, 2018 2:22 AM
To: Viswanathan, Sandhya <sandhya.viswanathan at intel.com>; 'panama-dev at openjdk.java.net' <panama-dev at openjdk.java.net>
Subject: Re: [vectorInstrinsics] merge with upstream failed


Hi,
not sure if it's related but we have started to see failures in our internal builds:

* For target jdk_modules_jdk.incubator.vector__the.jdk.incubator.vector_batch:

/scratch/langtools/workspace/workspace/panama-test/panama-branches/panama-vectorIntrinsics/panama/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte128Vector.java:39: error: Byte128Vector is not abstract and does not override abstract method aShiftR(int) in ByteVector

final class Byte128Vector extends ByteVector<Shapes.S128Bit> {

      ^

/scratch/langtools/workspace/workspace/panama-test/panama-branches/panama-vectorIntrinsics/panama/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte256Vector.java:39: error: Byte256Vector is not abstract and does not override abstract method aShiftR(int) in ByteVector

final class Byte256Vector extends ByteVector<Shapes.S256Bit> {

      ^

/scratch/langtools/workspace/workspace/panama-test/panama-branches/panama-vectorIntrinsics/panama/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte512Vector.java:39: error: Byte512Vector is not abstract and does not override abstract method aShiftR(int) in ByteVector

final class Byte512Vector extends ByteVector<Shapes.S512Bit> {

      ^

/scratch/langtools/workspace/workspace/panama-test/panama-branches/panama-vectorIntrinsics/panama/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte64Vector.java:39: error: Byte64Vector is not abstract and does not override abstract method aShiftR(int) in ByteVector

final class Byte64Vector extends ByteVector<Shapes.S64Bit> {

      ^

   ... (rest of output omitted)



* All command lines available in /scratch/langtools/workspace/workspace/panama-test/panama-branches/panama-vectorIntrinsics/panama/build/linux-x86_64-server-release/make-support/failure-logs.

=== End of repeated output ===



=== Make failed targets repeated here ===

CompileJavaModules.gmk:594: recipe for target '/scratch/langtools/workspace/workspace/panama-test/panama-branches/panama-vectorIntrinsics/panama/build/linux-x86_64-server-release/jdk/modules/jdk.incubator.vector/_the.jdk.incubator.vector_batch' failed

make/Main.gmk:199: recipe for target 'jdk.incubator.vector-java' failed




Is this a known issue?

Maurizio
On 02/10/18 17:55, Maurizio Cimadamore wrote:


On 02/10/18 17:50, Viswanathan, Sandhya wrote:

Thanks Maurizio for bringing our attention to this. FYI, we completed the manual merge yesterday.
Thanks, I noted that our internal build systems went back to green!

Cheers
Maurizio


Best Regards,
Sandhya


-----Original Message-----
From: panama-dev [mailto:panama-dev-bounces at openjdk.java.net] On Behalf Of Maurizio Cimadamore
Sent: Monday, October 01, 2018 6:26 AM
To: 'panama-dev at openjdk.java.net<mailto:panama-dev at openjdk.java.net>' <panama-dev at openjdk.java.net><mailto:panama-dev at openjdk.java.net>
Subject: [vectorInstrinsics] merge with upstream failed

Hi,
the vectorIntrinsics branch failed to merge because of the following
conflicts:

U src/hotspot/cpu/x86/assembler_x86.cpp
U src/hotspot/cpu/x86/macroAssembler_x86.cpp
U src/hotspot/cpu/x86/vm_version_x86.hpp
U src/hotspot/cpu/x86/x86.ad

I tried to take a look but the changes look a bit too deep for me to
handle the merge. Could please somebody from the vector team look at the
conflicts?

To start a merge:

$ hg update vectorIntrinsics

$ hg merge -r default

<do merge>

$ hg commit -m 'manual merge with default'

$ hg push

Cheers
Maurizio