hg: panama/dev: Fix jmh benchmark build failures.

[yang.zhang at arm.com]

Changeset: a059f2c353cf
Author:    yzhang
Date:      2019-07-23 09:48 +0800
URL:       https://hg.openjdk.java.net/panama/dev/rev/a059f2c353cf

Fix jmh benchmark build failures.
Summary: Update templates to fix jmh benchmark failures. In vector benchmarks,
"and" operation is used. To align with vector benchmarks, scalar benchmarks
should also use "and" operation.

! test/jdk/jdk/incubator/vector/benchmark/src/main/java/benchmark/jdk/incubator/vector/ByteScalar.java
! test/jdk/jdk/incubator/vector/benchmark/src/main/java/benchmark/jdk/incubator/vector/DoubleScalar.java
! test/jdk/jdk/incubator/vector/benchmark/src/main/java/benchmark/jdk/incubator/vector/FloatScalar.java
! test/jdk/jdk/incubator/vector/benchmark/src/main/java/benchmark/jdk/incubator/vector/IntScalar.java
! test/jdk/jdk/incubator/vector/benchmark/src/main/java/benchmark/jdk/incubator/vector/LongScalar.java
! test/jdk/jdk/incubator/vector/benchmark/src/main/java/benchmark/jdk/incubator/vector/ShortScalar.java
! test/jdk/jdk/incubator/vector/benchmark/src/main/java/benchmark/jdk/incubator/vector/SortVector.java
! test/jdk/jdk/incubator/vector/templates/Perf-Scalar-Broadcast.template
! test/jdk/jdk/incubator/vector/templates/Perf-Scalar-Compare.template
! test/jdk/jdk/incubator/vector/templates/Perf-Scalar-Test.template
! test/jdk/jdk/incubator/vector/templates/Perf-Scalar-Zero.template
! test/jdk/jdk/incubator/vector/templates/Perf-Scalar-header.template