8001183: incorrect results of char vectors right shift operaiton
Summary: do vector right shift operation for small int types only after loads
Reviewed-by: jrose, dlong
--- a/hotspot/src/cpu/x86/vm/x86.ad Mon Oct 22 16:56:03 2012 -0700
+++ b/hotspot/src/cpu/x86/vm/x86.ad Tue Oct 23 13:06:37 2012 -0700
@@ -4102,9 +4102,158 @@
// ----------------------- LogicalRightShift -----------------------------------
-// Shorts/Chars vector logical right shift produces incorrect Java result
+// Shorts vector logical right shift produces incorrect Java result
// for negative data because java code convert short value into int with
-// sign extension before a shift.
+// sign extension before a shift. But char vectors are fine since chars are
+// unsigned values.
+
+instruct vsrl2S(vecS dst, vecS shift) %{
+ predicate(n->as_Vector()->length() == 2);
+ match(Set dst (URShiftVS dst shift));
+ format %{ "psrlw $dst,$shift\t! logical right shift packed2S" %}
+ ins_encode %{
+ __ psrlw($dst$$XMMRegister, $shift$$XMMRegister);
+ %}
+ ins_pipe( pipe_slow );
+%}
+
+instruct vsrl2S_imm(vecS dst, immI8 shift) %{
+ predicate(n->as_Vector()->length() == 2);
+ match(Set dst (URShiftVS dst shift));
+ format %{ "psrlw $dst,$shift\t! logical right shift packed2S" %}
+ ins_encode %{
+ __ psrlw($dst$$XMMRegister, (int)$shift$$constant);
+ %}
+ ins_pipe( pipe_slow );
+%}
+
+instruct vsrl2S_reg(vecS dst, vecS src, vecS shift) %{
+ predicate(UseAVX > 0 && n->as_Vector()->length() == 2);
+ match(Set dst (URShiftVS src shift));
+ format %{ "vpsrlw $dst,$src,$shift\t! logical right shift packed2S" %}
+ ins_encode %{
+ bool vector256 = false;
+ __ vpsrlw($dst$$XMMRegister, $src$$XMMRegister, $shift$$XMMRegister, vector256);
+ %}
+ ins_pipe( pipe_slow );
+%}
+
+instruct vsrl2S_reg_imm(vecS dst, vecS src, immI8 shift) %{
+ predicate(UseAVX > 0 && n->as_Vector()->length() == 2);
+ match(Set dst (URShiftVS src shift));
+ format %{ "vpsrlw $dst,$src,$shift\t! logical right shift packed2S" %}
+ ins_encode %{
+ bool vector256 = false;
+ __ vpsrlw($dst$$XMMRegister, $src$$XMMRegister, (int)$shift$$constant, vector256);
+ %}
+ ins_pipe( pipe_slow );
+%}
+
+instruct vsrl4S(vecD dst, vecS shift) %{
+ predicate(n->as_Vector()->length() == 4);
+ match(Set dst (URShiftVS dst shift));
+ format %{ "psrlw $dst,$shift\t! logical right shift packed4S" %}
+ ins_encode %{
+ __ psrlw($dst$$XMMRegister, $shift$$XMMRegister);
+ %}
+ ins_pipe( pipe_slow );
+%}
+
+instruct vsrl4S_imm(vecD dst, immI8 shift) %{
+ predicate(n->as_Vector()->length() == 4);
+ match(Set dst (URShiftVS dst shift));
+ format %{ "psrlw $dst,$shift\t! logical right shift packed4S" %}
+ ins_encode %{
+ __ psrlw($dst$$XMMRegister, (int)$shift$$constant);
+ %}
+ ins_pipe( pipe_slow );
+%}
+
+instruct vsrl4S_reg(vecD dst, vecD src, vecS shift) %{
+ predicate(UseAVX > 0 && n->as_Vector()->length() == 4);
+ match(Set dst (URShiftVS src shift));
+ format %{ "vpsrlw $dst,$src,$shift\t! logical right shift packed4S" %}
+ ins_encode %{
+ bool vector256 = false;
+ __ vpsrlw($dst$$XMMRegister, $src$$XMMRegister, $shift$$XMMRegister, vector256);
+ %}
+ ins_pipe( pipe_slow );
+%}
+
+instruct vsrl4S_reg_imm(vecD dst, vecD src, immI8 shift) %{
+ predicate(UseAVX > 0 && n->as_Vector()->length() == 4);
+ match(Set dst (URShiftVS src shift));
+ format %{ "vpsrlw $dst,$src,$shift\t! logical right shift packed4S" %}
+ ins_encode %{
+ bool vector256 = false;
+ __ vpsrlw($dst$$XMMRegister, $src$$XMMRegister, (int)$shift$$constant, vector256);
+ %}
+ ins_pipe( pipe_slow );
+%}
+
+instruct vsrl8S(vecX dst, vecS shift) %{
+ predicate(n->as_Vector()->length() == 8);
+ match(Set dst (URShiftVS dst shift));
+ format %{ "psrlw $dst,$shift\t! logical right shift packed8S" %}
+ ins_encode %{
+ __ psrlw($dst$$XMMRegister, $shift$$XMMRegister);
+ %}
+ ins_pipe( pipe_slow );
+%}
+
+instruct vsrl8S_imm(vecX dst, immI8 shift) %{
+ predicate(n->as_Vector()->length() == 8);
+ match(Set dst (URShiftVS dst shift));
+ format %{ "psrlw $dst,$shift\t! logical right shift packed8S" %}
+ ins_encode %{
+ __ psrlw($dst$$XMMRegister, (int)$shift$$constant);
+ %}
+ ins_pipe( pipe_slow );
+%}
+
+instruct vsrl8S_reg(vecX dst, vecX src, vecS shift) %{
+ predicate(UseAVX > 0 && n->as_Vector()->length() == 8);
+ match(Set dst (URShiftVS src shift));
+ format %{ "vpsrlw $dst,$src,$shift\t! logical right shift packed8S" %}
+ ins_encode %{
+ bool vector256 = false;
+ __ vpsrlw($dst$$XMMRegister, $src$$XMMRegister, $shift$$XMMRegister, vector256);
+ %}
+ ins_pipe( pipe_slow );
+%}
+
+instruct vsrl8S_reg_imm(vecX dst, vecX src, immI8 shift) %{
+ predicate(UseAVX > 0 && n->as_Vector()->length() == 8);
+ match(Set dst (URShiftVS src shift));
+ format %{ "vpsrlw $dst,$src,$shift\t! logical right shift packed8S" %}
+ ins_encode %{
+ bool vector256 = false;
+ __ vpsrlw($dst$$XMMRegister, $src$$XMMRegister, (int)$shift$$constant, vector256);
+ %}
+ ins_pipe( pipe_slow );
+%}
+
+instruct vsrl16S_reg(vecY dst, vecY src, vecS shift) %{
+ predicate(UseAVX > 1 && n->as_Vector()->length() == 16);
+ match(Set dst (URShiftVS src shift));
+ format %{ "vpsrlw $dst,$src,$shift\t! logical right shift packed16S" %}
+ ins_encode %{
+ bool vector256 = true;
+ __ vpsrlw($dst$$XMMRegister, $src$$XMMRegister, $shift$$XMMRegister, vector256);
+ %}
+ ins_pipe( pipe_slow );
+%}
+
+instruct vsrl16S_reg_imm(vecY dst, vecY src, immI8 shift) %{
+ predicate(UseAVX > 1 && n->as_Vector()->length() == 16);
+ match(Set dst (URShiftVS src shift));
+ format %{ "vpsrlw $dst,$src,$shift\t! logical right shift packed16S" %}
+ ins_encode %{
+ bool vector256 = true;
+ __ vpsrlw($dst$$XMMRegister, $src$$XMMRegister, (int)$shift$$constant, vector256);
+ %}
+ ins_pipe( pipe_slow );
+%}
// Integers vector logical right shift
instruct vsrl2I(vecD dst, vecS shift) %{
--- a/hotspot/src/share/vm/opto/superword.cpp Mon Oct 22 16:56:03 2012 -0700
+++ b/hotspot/src/share/vm/opto/superword.cpp Tue Oct 23 13:06:37 2012 -0700
@@ -1776,16 +1776,15 @@
set_velt_type(n, container_type(n));
}
- // Propagate narrowed type backwards through operations
+ // Propagate integer narrowed type backwards through operations
// that don't depend on higher order bits
for (int i = _block.length() - 1; i >= 0; i--) {
Node* n = _block.at(i);
// Only integer types need be examined
- const Type* vt = velt_type(n);
- if (vt->basic_type() == T_INT) {
+ const Type* vtn = velt_type(n);
+ if (vtn->basic_type() == T_INT) {
uint start, end;
VectorNode::vector_operands(n, &start, &end);
- const Type* vt = velt_type(n);
for (uint j = start; j < end; j++) {
Node* in = n->in(j);
@@ -1801,6 +1800,24 @@
}
}
if (same_type) {
+ // For right shifts of small integer types (bool, byte, char, short)
+ // we need precise information about sign-ness. Only Load nodes have
+ // this information because Store nodes are the same for signed and
+ // unsigned values. And any arithmetic operation after a load may
+ // expand a value to signed Int so such right shifts can't be used
+ // because vector elements do not have upper bits of Int.
+ const Type* vt = vtn;
+ if (VectorNode::is_shift(in)) {
+ Node* load = in->in(1);
+ if (load->is_Load() && (velt_type(load)->basic_type() == T_INT)) {
+ vt = velt_type(load);
+ } else if (in->Opcode() != Op_LShiftI) {
+ // Widen type to Int to avoid creation of right shift vector
+ // (align + data_size(s1) check in stmts_can_pack() will fail).
+ // Note, left shifts work regardless type.
+ vt = TypeInt::INT;
+ }
+ }
set_velt_type(in, vt);
}
}
@@ -1841,7 +1858,20 @@
// Smallest type containing range of values
const Type* SuperWord::container_type(Node* n) {
if (n->is_Mem()) {
- return Type::get_const_basic_type(n->as_Mem()->memory_type());
+ BasicType bt = n->as_Mem()->memory_type();
+ if (n->is_Store() && (bt == T_CHAR)) {
+ // Use T_SHORT type instead of T_CHAR for stored values because any
+ // preceding arithmetic operation extends values to signed Int.
+ bt = T_SHORT;
+ }
+ if (n->Opcode() == Op_LoadUB) {
+ // Adjust type for unsigned byte loads, it is important for right shifts.
+ // T_BOOLEAN is used because there is no basic type representing type
+ // TypeInt::UBYTE. Use of T_BOOLEAN for vectors is fine because only
+ // size (one byte) and sign is important.
+ bt = T_BOOLEAN;
+ }
+ return Type::get_const_basic_type(bt);
}
const Type* t = _igvn.type(n);
if (t->basic_type() == T_INT) {
--- a/hotspot/src/share/vm/opto/vectornode.cpp Mon Oct 22 16:56:03 2012 -0700
+++ b/hotspot/src/share/vm/opto/vectornode.cpp Tue Oct 23 13:06:37 2012 -0700
@@ -103,9 +103,9 @@
return Op_LShiftVL;
case Op_RShiftI:
switch (bt) {
- case T_BOOLEAN:
+ case T_BOOLEAN:return Op_URShiftVB; // boolean is unsigned value
+ case T_CHAR: return Op_URShiftVS; // char is unsigned value
case T_BYTE: return Op_RShiftVB;
- case T_CHAR:
case T_SHORT: return Op_RShiftVS;
case T_INT: return Op_RShiftVI;
}
@@ -115,10 +115,14 @@
return Op_RShiftVL;
case Op_URShiftI:
switch (bt) {
- case T_BOOLEAN:
- case T_BYTE: return Op_URShiftVB;
- case T_CHAR:
- case T_SHORT: return Op_URShiftVS;
+ case T_BOOLEAN:return Op_URShiftVB;
+ case T_CHAR: return Op_URShiftVS;
+ case T_BYTE:
+ case T_SHORT: return 0; // Vector logical right shift for signed short
+ // values produces incorrect Java result for
+ // negative data because java code should convert
+ // a short value into int value with sign
+ // extension before a shift.
case T_INT: return Op_URShiftVI;
}
ShouldNotReachHere();
--- a/hotspot/test/compiler/6340864/TestByteVect.java Mon Oct 22 16:56:03 2012 -0700
+++ b/hotspot/test/compiler/6340864/TestByteVect.java Tue Oct 23 13:06:37 2012 -0700
@@ -33,7 +33,7 @@
public class TestByteVect {
private static final int ARRLEN = 997;
private static final int ITERS = 11000;
- private static final int ADD_INIT = 0;
+ private static final int ADD_INIT = 63;
private static final int BIT_MASK = 0xB7;
private static final int VALUE = 3;
private static final int SHIFT = 8;
@@ -76,6 +76,7 @@
test_subc(a0, a1);
test_subv(a0, a1, (byte)VALUE);
test_suba(a0, a1, a2);
+
test_mulc(a0, a1);
test_mulv(a0, a1, (byte)VALUE);
test_mula(a0, a1, a2);
@@ -88,6 +89,7 @@
test_divc_n(a0, a1);
test_divv(a0, a1, (byte)-VALUE);
test_diva(a0, a1, a3);
+
test_andc(a0, a1);
test_andv(a0, a1, (byte)BIT_MASK);
test_anda(a0, a1, a4);
@@ -97,30 +99,49 @@
test_xorc(a0, a1);
test_xorv(a0, a1, (byte)BIT_MASK);
test_xora(a0, a1, a4);
+
test_sllc(a0, a1);
test_sllv(a0, a1, VALUE);
test_srlc(a0, a1);
test_srlv(a0, a1, VALUE);
test_srac(a0, a1);
test_srav(a0, a1, VALUE);
+
test_sllc_n(a0, a1);
test_sllv(a0, a1, -VALUE);
test_srlc_n(a0, a1);
test_srlv(a0, a1, -VALUE);
test_srac_n(a0, a1);
test_srav(a0, a1, -VALUE);
+
test_sllc_o(a0, a1);
test_sllv(a0, a1, SHIFT);
test_srlc_o(a0, a1);
test_srlv(a0, a1, SHIFT);
test_srac_o(a0, a1);
test_srav(a0, a1, SHIFT);
+
test_sllc_on(a0, a1);
test_sllv(a0, a1, -SHIFT);
test_srlc_on(a0, a1);
test_srlv(a0, a1, -SHIFT);
test_srac_on(a0, a1);
test_srav(a0, a1, -SHIFT);
+
+ test_sllc_add(a0, a1);
+ test_sllv_add(a0, a1, ADD_INIT);
+ test_srlc_add(a0, a1);
+ test_srlv_add(a0, a1, ADD_INIT);
+ test_srac_add(a0, a1);
+ test_srav_add(a0, a1, ADD_INIT);
+
+ test_sllc_and(a0, a1);
+ test_sllv_and(a0, a1, BIT_MASK);
+ test_srlc_and(a0, a1);
+ test_srlv_and(a0, a1, BIT_MASK);
+ test_srac_and(a0, a1);
+ test_srav_and(a0, a1, BIT_MASK);
+
test_pack2(p2, a1);
test_unpack2(a0, p2);
test_pack2_swap(p2, a1);
@@ -369,6 +390,60 @@
errn += verify("test_srav_on: ", i, a0[i], (byte)((byte)(ADD_INIT+i)>>(-SHIFT)));
}
+ test_sllc_add(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_sllc_add: ", i, a0[i], (byte)(((byte)(ADD_INIT+i) + ADD_INIT)<<VALUE));
+ }
+ test_sllv_add(a0, a1, ADD_INIT);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_sllv_add: ", i, a0[i], (byte)(((byte)(ADD_INIT+i) + ADD_INIT)<<VALUE));
+ }
+
+ test_srlc_add(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srlc_add: ", i, a0[i], (byte)(((byte)(ADD_INIT+i) + ADD_INIT)>>>VALUE));
+ }
+ test_srlv_add(a0, a1, ADD_INIT);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srlv_add: ", i, a0[i], (byte)(((byte)(ADD_INIT+i) + ADD_INIT)>>>VALUE));
+ }
+
+ test_srac_add(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srac_add: ", i, a0[i], (byte)(((byte)(ADD_INIT+i) + ADD_INIT)>>VALUE));
+ }
+ test_srav_add(a0, a1, ADD_INIT);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srav_add: ", i, a0[i], (byte)(((byte)(ADD_INIT+i) + ADD_INIT)>>VALUE));
+ }
+
+ test_sllc_and(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_sllc_and: ", i, a0[i], (byte)(((byte)(ADD_INIT+i) & BIT_MASK)<<VALUE));
+ }
+ test_sllv_and(a0, a1, BIT_MASK);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_sllv_and: ", i, a0[i], (byte)(((byte)(ADD_INIT+i) & BIT_MASK)<<VALUE));
+ }
+
+ test_srlc_and(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srlc_and: ", i, a0[i], (byte)(((byte)(ADD_INIT+i) & BIT_MASK)>>>VALUE));
+ }
+ test_srlv_and(a0, a1, BIT_MASK);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srlv_and: ", i, a0[i], (byte)(((byte)(ADD_INIT+i) & BIT_MASK)>>>VALUE));
+ }
+
+ test_srac_and(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srac_and: ", i, a0[i], (byte)(((byte)(ADD_INIT+i) & BIT_MASK)>>VALUE));
+ }
+ test_srav_and(a0, a1, BIT_MASK);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srav_and: ", i, a0[i], (byte)(((byte)(ADD_INIT+i) & BIT_MASK)>>VALUE));
+ }
+
test_pack2(p2, a1);
for (int i=0; i<ARRLEN/2; i++) {
errn += verify("test_pack2: ", i, p2[i], (short)(((short)(ADD_INIT+2*i) & 0xFF) | ((short)(ADD_INIT+2*i+1) << 8)));
@@ -805,6 +880,84 @@
start = System.currentTimeMillis();
for (int i=0; i<ITERS; i++) {
+ test_sllc_add(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_sllc_add: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_sllv_add(a0, a1, ADD_INIT);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_sllv_add: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srlc_add(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srlc_add: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srlv_add(a0, a1, ADD_INIT);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srlv_add: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srac_add(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srac_add: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srav_add(a0, a1, ADD_INIT);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srav_add: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_sllc_and(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_sllc_and: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_sllv_and(a0, a1, BIT_MASK);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_sllv_and: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srlc_and(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srlc_and: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srlv_and(a0, a1, BIT_MASK);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srlv_and: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srac_and(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srac_and: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srav_and(a0, a1, BIT_MASK);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srav_and: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
test_pack2(p2, a1);
}
end = System.currentTimeMillis();
@@ -1036,6 +1189,26 @@
a0[i] = (byte)(a1[i]<<b);
}
}
+ static void test_sllc_add(byte[] a0, byte[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (byte)((a1[i] + ADD_INIT)<<VALUE);
+ }
+ }
+ static void test_sllv_add(byte[] a0, byte[] a1, int b) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (byte)((a1[i] + b)<<VALUE);
+ }
+ }
+ static void test_sllc_and(byte[] a0, byte[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (byte)((a1[i] & BIT_MASK)<<VALUE);
+ }
+ }
+ static void test_sllv_and(byte[] a0, byte[] a1, int b) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (byte)((a1[i] & b)<<VALUE);
+ }
+ }
static void test_srlc(byte[] a0, byte[] a1) {
for (int i = 0; i < a0.length; i+=1) {
@@ -1062,6 +1235,26 @@
a0[i] = (byte)(a1[i]>>>b);
}
}
+ static void test_srlc_add(byte[] a0, byte[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (byte)((a1[i] + ADD_INIT)>>>VALUE);
+ }
+ }
+ static void test_srlv_add(byte[] a0, byte[] a1, int b) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (byte)((a1[i] + b)>>>VALUE);
+ }
+ }
+ static void test_srlc_and(byte[] a0, byte[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (byte)((a1[i] & BIT_MASK)>>>VALUE);
+ }
+ }
+ static void test_srlv_and(byte[] a0, byte[] a1, int b) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (byte)((a1[i] & b)>>>VALUE);
+ }
+ }
static void test_srac(byte[] a0, byte[] a1) {
for (int i = 0; i < a0.length; i+=1) {
@@ -1088,6 +1281,26 @@
a0[i] = (byte)(a1[i]>>b);
}
}
+ static void test_srac_add(byte[] a0, byte[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (byte)((a1[i] + ADD_INIT)>>VALUE);
+ }
+ }
+ static void test_srav_add(byte[] a0, byte[] a1, int b) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (byte)((a1[i] + b)>>VALUE);
+ }
+ }
+ static void test_srac_and(byte[] a0, byte[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (byte)((a1[i] & BIT_MASK)>>VALUE);
+ }
+ }
+ static void test_srav_and(byte[] a0, byte[] a1, int b) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (byte)((a1[i] & b)>>VALUE);
+ }
+ }
static void test_pack2(short[] p2, byte[] a1) {
if (p2.length*2 > a1.length) return;
--- a/hotspot/test/compiler/6340864/TestIntVect.java Mon Oct 22 16:56:03 2012 -0700
+++ b/hotspot/test/compiler/6340864/TestIntVect.java Tue Oct 23 13:06:37 2012 -0700
@@ -74,6 +74,7 @@
test_subc(a0, a1);
test_subv(a0, a1, (int)VALUE);
test_suba(a0, a1, a2);
+
test_mulc(a0, a1);
test_mulv(a0, a1, (int)VALUE);
test_mula(a0, a1, a2);
@@ -86,6 +87,7 @@
test_divc_n(a0, a1);
test_divv(a0, a1, (int)-VALUE);
test_diva(a0, a1, a3);
+
test_andc(a0, a1);
test_andv(a0, a1, (int)BIT_MASK);
test_anda(a0, a1, a4);
@@ -95,30 +97,49 @@
test_xorc(a0, a1);
test_xorv(a0, a1, (int)BIT_MASK);
test_xora(a0, a1, a4);
+
test_sllc(a0, a1);
test_sllv(a0, a1, VALUE);
test_srlc(a0, a1);
test_srlv(a0, a1, VALUE);
test_srac(a0, a1);
test_srav(a0, a1, VALUE);
+
test_sllc_n(a0, a1);
test_sllv(a0, a1, -VALUE);
test_srlc_n(a0, a1);
test_srlv(a0, a1, -VALUE);
test_srac_n(a0, a1);
test_srav(a0, a1, -VALUE);
+
test_sllc_o(a0, a1);
test_sllv(a0, a1, SHIFT);
test_srlc_o(a0, a1);
test_srlv(a0, a1, SHIFT);
test_srac_o(a0, a1);
test_srav(a0, a1, SHIFT);
+
test_sllc_on(a0, a1);
test_sllv(a0, a1, -SHIFT);
test_srlc_on(a0, a1);
test_srlv(a0, a1, -SHIFT);
test_srac_on(a0, a1);
test_srav(a0, a1, -SHIFT);
+
+ test_sllc_add(a0, a1);
+ test_sllv_add(a0, a1, ADD_INIT);
+ test_srlc_add(a0, a1);
+ test_srlv_add(a0, a1, ADD_INIT);
+ test_srac_add(a0, a1);
+ test_srav_add(a0, a1, ADD_INIT);
+
+ test_sllc_and(a0, a1);
+ test_sllv_and(a0, a1, BIT_MASK);
+ test_srlc_and(a0, a1);
+ test_srlv_and(a0, a1, BIT_MASK);
+ test_srac_and(a0, a1);
+ test_srav_and(a0, a1, BIT_MASK);
+
test_pack2(p2, a1);
test_unpack2(a0, p2);
test_pack2_swap(p2, a1);
@@ -359,6 +380,60 @@
errn += verify("test_srav_on: ", i, a0[i], (int)((int)(ADD_INIT+i)>>(-SHIFT)));
}
+ test_sllc_add(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_sllc_add: ", i, a0[i], (int)(((int)(ADD_INIT+i) + ADD_INIT)<<VALUE));
+ }
+ test_sllv_add(a0, a1, ADD_INIT);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_sllv_add: ", i, a0[i], (int)(((int)(ADD_INIT+i) + ADD_INIT)<<VALUE));
+ }
+
+ test_srlc_add(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srlc_add: ", i, a0[i], (int)(((int)(ADD_INIT+i) + ADD_INIT)>>>VALUE));
+ }
+ test_srlv_add(a0, a1, ADD_INIT);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srlv_add: ", i, a0[i], (int)(((int)(ADD_INIT+i) + ADD_INIT)>>>VALUE));
+ }
+
+ test_srac_add(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srac_add: ", i, a0[i], (int)(((int)(ADD_INIT+i) + ADD_INIT)>>VALUE));
+ }
+ test_srav_add(a0, a1, ADD_INIT);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srav_add: ", i, a0[i], (int)(((int)(ADD_INIT+i) + ADD_INIT)>>VALUE));
+ }
+
+ test_sllc_and(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_sllc_and: ", i, a0[i], (int)(((int)(ADD_INIT+i) & BIT_MASK)<<VALUE));
+ }
+ test_sllv_and(a0, a1, BIT_MASK);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_sllv_and: ", i, a0[i], (int)(((int)(ADD_INIT+i) & BIT_MASK)<<VALUE));
+ }
+
+ test_srlc_and(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srlc_and: ", i, a0[i], (int)(((int)(ADD_INIT+i) & BIT_MASK)>>>VALUE));
+ }
+ test_srlv_and(a0, a1, BIT_MASK);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srlv_and: ", i, a0[i], (int)(((int)(ADD_INIT+i) & BIT_MASK)>>>VALUE));
+ }
+
+ test_srac_and(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srac_and: ", i, a0[i], (int)(((int)(ADD_INIT+i) & BIT_MASK)>>VALUE));
+ }
+ test_srav_and(a0, a1, BIT_MASK);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srav_and: ", i, a0[i], (int)(((int)(ADD_INIT+i) & BIT_MASK)>>VALUE));
+ }
+
test_pack2(p2, a1);
for (int i=0; i<ARRLEN/2; i++) {
errn += verify("test_pack2: ", i, p2[i], ((long)(ADD_INIT+2*i) & 0xFFFFFFFFl) | ((long)(ADD_INIT+2*i+1) << 32));
@@ -727,6 +802,84 @@
start = System.currentTimeMillis();
for (int i=0; i<ITERS; i++) {
+ test_sllc_add(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_sllc_add: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_sllv_add(a0, a1, ADD_INIT);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_sllv_add: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srlc_add(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srlc_add: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srlv_add(a0, a1, ADD_INIT);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srlv_add: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srac_add(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srac_add: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srav_add(a0, a1, ADD_INIT);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srav_add: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_sllc_and(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_sllc_and: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_sllv_and(a0, a1, BIT_MASK);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_sllv_and: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srlc_and(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srlc_and: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srlv_and(a0, a1, BIT_MASK);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srlv_and: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srac_and(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srac_and: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srav_and(a0, a1, BIT_MASK);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srav_and: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
test_pack2(p2, a1);
}
end = System.currentTimeMillis();
@@ -908,6 +1061,26 @@
a0[i] = (int)(a1[i]<<b);
}
}
+ static void test_sllc_add(int[] a0, int[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (int)((a1[i] + ADD_INIT)<<VALUE);
+ }
+ }
+ static void test_sllv_add(int[] a0, int[] a1, int b) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (int)((a1[i] + b)<<VALUE);
+ }
+ }
+ static void test_sllc_and(int[] a0, int[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (int)((a1[i] & BIT_MASK)<<VALUE);
+ }
+ }
+ static void test_sllv_and(int[] a0, int[] a1, int b) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (int)((a1[i] & b)<<VALUE);
+ }
+ }
static void test_srlc(int[] a0, int[] a1) {
for (int i = 0; i < a0.length; i+=1) {
@@ -934,6 +1107,26 @@
a0[i] = (int)(a1[i]>>>b);
}
}
+ static void test_srlc_add(int[] a0, int[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (int)((a1[i] + ADD_INIT)>>>VALUE);
+ }
+ }
+ static void test_srlv_add(int[] a0, int[] a1, int b) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (int)((a1[i] + b)>>>VALUE);
+ }
+ }
+ static void test_srlc_and(int[] a0, int[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (int)((a1[i] & BIT_MASK)>>>VALUE);
+ }
+ }
+ static void test_srlv_and(int[] a0, int[] a1, int b) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (int)((a1[i] & b)>>>VALUE);
+ }
+ }
static void test_srac(int[] a0, int[] a1) {
for (int i = 0; i < a0.length; i+=1) {
@@ -960,6 +1153,26 @@
a0[i] = (int)(a1[i]>>b);
}
}
+ static void test_srac_add(int[] a0, int[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (int)((a1[i] + ADD_INIT)>>VALUE);
+ }
+ }
+ static void test_srav_add(int[] a0, int[] a1, int b) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (int)((a1[i] + b)>>VALUE);
+ }
+ }
+ static void test_srac_and(int[] a0, int[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (int)((a1[i] & BIT_MASK)>>VALUE);
+ }
+ }
+ static void test_srav_and(int[] a0, int[] a1, int b) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (int)((a1[i] & b)>>VALUE);
+ }
+ }
static void test_pack2(long[] p2, int[] a1) {
if (p2.length*2 > a1.length) return;
--- a/hotspot/test/compiler/6340864/TestLongVect.java Mon Oct 22 16:56:03 2012 -0700
+++ b/hotspot/test/compiler/6340864/TestLongVect.java Tue Oct 23 13:06:37 2012 -0700
@@ -73,6 +73,7 @@
test_subc(a0, a1);
test_subv(a0, a1, (long)VALUE);
test_suba(a0, a1, a2);
+
test_mulc(a0, a1);
test_mulv(a0, a1, (long)VALUE);
test_mula(a0, a1, a2);
@@ -85,6 +86,7 @@
test_divc_n(a0, a1);
test_divv(a0, a1, (long)-VALUE);
test_diva(a0, a1, a3);
+
test_andc(a0, a1);
test_andv(a0, a1, (long)BIT_MASK);
test_anda(a0, a1, a4);
@@ -94,30 +96,48 @@
test_xorc(a0, a1);
test_xorv(a0, a1, (long)BIT_MASK);
test_xora(a0, a1, a4);
+
test_sllc(a0, a1);
test_sllv(a0, a1, VALUE);
test_srlc(a0, a1);
test_srlv(a0, a1, VALUE);
test_srac(a0, a1);
test_srav(a0, a1, VALUE);
+
test_sllc_n(a0, a1);
test_sllv(a0, a1, -VALUE);
test_srlc_n(a0, a1);
test_srlv(a0, a1, -VALUE);
test_srac_n(a0, a1);
test_srav(a0, a1, -VALUE);
+
test_sllc_o(a0, a1);
test_sllv(a0, a1, SHIFT);
test_srlc_o(a0, a1);
test_srlv(a0, a1, SHIFT);
test_srac_o(a0, a1);
test_srav(a0, a1, SHIFT);
+
test_sllc_on(a0, a1);
test_sllv(a0, a1, -SHIFT);
test_srlc_on(a0, a1);
test_srlv(a0, a1, -SHIFT);
test_srac_on(a0, a1);
test_srav(a0, a1, -SHIFT);
+
+ test_sllc_add(a0, a1);
+ test_sllv_add(a0, a1, ADD_INIT);
+ test_srlc_add(a0, a1);
+ test_srlv_add(a0, a1, ADD_INIT);
+ test_srac_add(a0, a1);
+ test_srav_add(a0, a1, ADD_INIT);
+
+ test_sllc_and(a0, a1);
+ test_sllv_and(a0, a1, BIT_MASK);
+ test_srlc_and(a0, a1);
+ test_srlv_and(a0, a1, BIT_MASK);
+ test_srac_and(a0, a1);
+ test_srav_and(a0, a1, BIT_MASK);
}
// Test and verify results
System.out.println("Verification");
@@ -354,6 +374,60 @@
errn += verify("test_srav_on: ", i, a0[i], (long)((long)(ADD_INIT+i)>>(-SHIFT)));
}
+ test_sllc_add(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_sllc_add: ", i, a0[i], (long)(((long)(ADD_INIT+i) + ADD_INIT)<<VALUE));
+ }
+ test_sllv_add(a0, a1, ADD_INIT);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_sllv_add: ", i, a0[i], (long)(((long)(ADD_INIT+i) + ADD_INIT)<<VALUE));
+ }
+
+ test_srlc_add(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srlc_add: ", i, a0[i], (long)(((long)(ADD_INIT+i) + ADD_INIT)>>>VALUE));
+ }
+ test_srlv_add(a0, a1, ADD_INIT);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srlv_add: ", i, a0[i], (long)(((long)(ADD_INIT+i) + ADD_INIT)>>>VALUE));
+ }
+
+ test_srac_add(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srac_add: ", i, a0[i], (long)(((long)(ADD_INIT+i) + ADD_INIT)>>VALUE));
+ }
+ test_srav_add(a0, a1, ADD_INIT);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srav_add: ", i, a0[i], (long)(((long)(ADD_INIT+i) + ADD_INIT)>>VALUE));
+ }
+
+ test_sllc_and(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_sllc_and: ", i, a0[i], (long)(((long)(ADD_INIT+i) & BIT_MASK)<<VALUE));
+ }
+ test_sllv_and(a0, a1, BIT_MASK);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_sllv_and: ", i, a0[i], (long)(((long)(ADD_INIT+i) & BIT_MASK)<<VALUE));
+ }
+
+ test_srlc_and(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srlc_and: ", i, a0[i], (long)(((long)(ADD_INIT+i) & BIT_MASK)>>>VALUE));
+ }
+ test_srlv_and(a0, a1, BIT_MASK);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srlv_and: ", i, a0[i], (long)(((long)(ADD_INIT+i) & BIT_MASK)>>>VALUE));
+ }
+
+ test_srac_and(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srac_and: ", i, a0[i], (long)(((long)(ADD_INIT+i) & BIT_MASK)>>VALUE));
+ }
+ test_srav_and(a0, a1, BIT_MASK);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srav_and: ", i, a0[i], (long)(((long)(ADD_INIT+i) & BIT_MASK)>>VALUE));
+ }
+
}
if (errn > 0)
@@ -696,6 +770,84 @@
end = System.currentTimeMillis();
System.out.println("test_srav_on: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_sllc_add(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_sllc_add: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_sllv_add(a0, a1, ADD_INIT);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_sllv_add: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srlc_add(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srlc_add: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srlv_add(a0, a1, ADD_INIT);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srlv_add: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srac_add(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srac_add: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srav_add(a0, a1, ADD_INIT);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srav_add: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_sllc_and(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_sllc_and: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_sllv_and(a0, a1, BIT_MASK);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_sllv_and: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srlc_and(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srlc_and: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srlv_and(a0, a1, BIT_MASK);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srlv_and: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srac_and(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srac_and: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srav_and(a0, a1, BIT_MASK);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srav_and: " + (end - start));
+
return errn;
}
@@ -854,6 +1006,26 @@
a0[i] = (long)(a1[i]<<b);
}
}
+ static void test_sllc_add(long[] a0, long[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (long)((a1[i] + ADD_INIT)<<VALUE);
+ }
+ }
+ static void test_sllv_add(long[] a0, long[] a1, long b) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (long)((a1[i] + b)<<VALUE);
+ }
+ }
+ static void test_sllc_and(long[] a0, long[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (long)((a1[i] & BIT_MASK)<<VALUE);
+ }
+ }
+ static void test_sllv_and(long[] a0, long[] a1, long b) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (long)((a1[i] & b)<<VALUE);
+ }
+ }
static void test_srlc(long[] a0, long[] a1) {
for (int i = 0; i < a0.length; i+=1) {
@@ -880,6 +1052,26 @@
a0[i] = (long)(a1[i]>>>b);
}
}
+ static void test_srlc_add(long[] a0, long[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (long)((a1[i] + ADD_INIT)>>>VALUE);
+ }
+ }
+ static void test_srlv_add(long[] a0, long[] a1, long b) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (long)((a1[i] + b)>>>VALUE);
+ }
+ }
+ static void test_srlc_and(long[] a0, long[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (long)((a1[i] & BIT_MASK)>>>VALUE);
+ }
+ }
+ static void test_srlv_and(long[] a0, long[] a1, long b) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (long)((a1[i] & b)>>>VALUE);
+ }
+ }
static void test_srac(long[] a0, long[] a1) {
for (int i = 0; i < a0.length; i+=1) {
@@ -906,6 +1098,26 @@
a0[i] = (long)(a1[i]>>b);
}
}
+ static void test_srac_add(long[] a0, long[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (long)((a1[i] + ADD_INIT)>>VALUE);
+ }
+ }
+ static void test_srav_add(long[] a0, long[] a1, long b) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (long)((a1[i] + b)>>VALUE);
+ }
+ }
+ static void test_srac_and(long[] a0, long[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (long)((a1[i] & BIT_MASK)>>VALUE);
+ }
+ }
+ static void test_srav_and(long[] a0, long[] a1, long b) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (long)((a1[i] & b)>>VALUE);
+ }
+ }
static int verify(String text, int i, long elem, long val) {
if (elem != val) {
--- a/hotspot/test/compiler/6340864/TestShortVect.java Mon Oct 22 16:56:03 2012 -0700
+++ b/hotspot/test/compiler/6340864/TestShortVect.java Tue Oct 23 13:06:37 2012 -0700
@@ -75,6 +75,7 @@
test_subc(a0, a1);
test_subv(a0, a1, (short)VALUE);
test_suba(a0, a1, a2);
+
test_mulc(a0, a1);
test_mulv(a0, a1, (short)VALUE);
test_mula(a0, a1, a2);
@@ -87,6 +88,7 @@
test_divc_n(a0, a1);
test_divv(a0, a1, (short)-VALUE);
test_diva(a0, a1, a3);
+
test_andc(a0, a1);
test_andv(a0, a1, (short)BIT_MASK);
test_anda(a0, a1, a4);
@@ -96,30 +98,49 @@
test_xorc(a0, a1);
test_xorv(a0, a1, (short)BIT_MASK);
test_xora(a0, a1, a4);
+
test_sllc(a0, a1);
test_sllv(a0, a1, VALUE);
test_srlc(a0, a1);
test_srlv(a0, a1, VALUE);
test_srac(a0, a1);
test_srav(a0, a1, VALUE);
+
test_sllc_n(a0, a1);
test_sllv(a0, a1, -VALUE);
test_srlc_n(a0, a1);
test_srlv(a0, a1, -VALUE);
test_srac_n(a0, a1);
test_srav(a0, a1, -VALUE);
+
test_sllc_o(a0, a1);
test_sllv(a0, a1, SHIFT);
test_srlc_o(a0, a1);
test_srlv(a0, a1, SHIFT);
test_srac_o(a0, a1);
test_srav(a0, a1, SHIFT);
+
test_sllc_on(a0, a1);
test_sllv(a0, a1, -SHIFT);
test_srlc_on(a0, a1);
test_srlv(a0, a1, -SHIFT);
test_srac_on(a0, a1);
test_srav(a0, a1, -SHIFT);
+
+ test_sllc_add(a0, a1);
+ test_sllv_add(a0, a1, ADD_INIT);
+ test_srlc_add(a0, a1);
+ test_srlv_add(a0, a1, ADD_INIT);
+ test_srac_add(a0, a1);
+ test_srav_add(a0, a1, ADD_INIT);
+
+ test_sllc_and(a0, a1);
+ test_sllv_and(a0, a1, BIT_MASK);
+ test_srlc_and(a0, a1);
+ test_srlv_and(a0, a1, BIT_MASK);
+ test_srac_and(a0, a1);
+ test_srav_and(a0, a1, BIT_MASK);
+
test_pack2(p2, a1);
test_unpack2(a0, p2);
test_pack2_swap(p2, a1);
@@ -364,6 +385,60 @@
errn += verify("test_srav_on: ", i, a0[i], (short)((short)(ADD_INIT+i)>>(-SHIFT)));
}
+ test_sllc_add(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_sllc_add: ", i, a0[i], (short)(((short)(ADD_INIT+i) + ADD_INIT)<<VALUE));
+ }
+ test_sllv_add(a0, a1, ADD_INIT);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_sllv_add: ", i, a0[i], (short)(((short)(ADD_INIT+i) + ADD_INIT)<<VALUE));
+ }
+
+ test_srlc_add(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srlc_add: ", i, a0[i], (short)(((short)(ADD_INIT+i) + ADD_INIT)>>>VALUE));
+ }
+ test_srlv_add(a0, a1, ADD_INIT);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srlv_add: ", i, a0[i], (short)(((short)(ADD_INIT+i) + ADD_INIT)>>>VALUE));
+ }
+
+ test_srac_add(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srac_add: ", i, a0[i], (short)(((short)(ADD_INIT+i) + ADD_INIT)>>VALUE));
+ }
+ test_srav_add(a0, a1, ADD_INIT);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srav_add: ", i, a0[i], (short)(((short)(ADD_INIT+i) + ADD_INIT)>>VALUE));
+ }
+
+ test_sllc_and(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_sllc_and: ", i, a0[i], (short)(((short)(ADD_INIT+i) & BIT_MASK)<<VALUE));
+ }
+ test_sllv_and(a0, a1, BIT_MASK);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_sllv_and: ", i, a0[i], (short)(((short)(ADD_INIT+i) & BIT_MASK)<<VALUE));
+ }
+
+ test_srlc_and(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srlc_and: ", i, a0[i], (short)(((short)(ADD_INIT+i) & BIT_MASK)>>>VALUE));
+ }
+ test_srlv_and(a0, a1, BIT_MASK);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srlv_and: ", i, a0[i], (short)(((short)(ADD_INIT+i) & BIT_MASK)>>>VALUE));
+ }
+
+ test_srac_and(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srac_and: ", i, a0[i], (short)(((short)(ADD_INIT+i) & BIT_MASK)>>VALUE));
+ }
+ test_srav_and(a0, a1, BIT_MASK);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srav_and: ", i, a0[i], (short)(((short)(ADD_INIT+i) & BIT_MASK)>>VALUE));
+ }
+
test_pack2(p2, a1);
for (int i=0; i<ARRLEN/2; i++) {
errn += verify("test_pack2: ", i, p2[i], ((int)(ADD_INIT+2*i) & 0xFFFF) | ((int)(ADD_INIT+2*i+1) << 16));
@@ -762,6 +837,84 @@
start = System.currentTimeMillis();
for (int i=0; i<ITERS; i++) {
+ test_sllc_add(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_sllc_add: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_sllv_add(a0, a1, ADD_INIT);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_sllv_add: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srlc_add(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srlc_add: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srlv_add(a0, a1, ADD_INIT);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srlv_add: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srac_add(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srac_add: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srav_add(a0, a1, ADD_INIT);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srav_add: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_sllc_and(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_sllc_and: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_sllv_and(a0, a1, BIT_MASK);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_sllv_and: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srlc_and(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srlc_and: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srlv_and(a0, a1, BIT_MASK);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srlv_and: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srac_and(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srac_and: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srav_and(a0, a1, BIT_MASK);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srav_and: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
test_pack2(p2, a1);
}
end = System.currentTimeMillis();
@@ -968,6 +1121,26 @@
a0[i] = (short)(a1[i]<<b);
}
}
+ static void test_sllc_add(short[] a0, short[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (short)((a1[i] + ADD_INIT)<<VALUE);
+ }
+ }
+ static void test_sllv_add(short[] a0, short[] a1, int b) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (short)((a1[i] + b)<<VALUE);
+ }
+ }
+ static void test_sllc_and(short[] a0, short[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (short)((a1[i] & BIT_MASK)<<VALUE);
+ }
+ }
+ static void test_sllv_and(short[] a0, short[] a1, int b) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (short)((a1[i] & b)<<VALUE);
+ }
+ }
static void test_srlc(short[] a0, short[] a1) {
for (int i = 0; i < a0.length; i+=1) {
@@ -994,6 +1167,26 @@
a0[i] = (short)(a1[i]>>>b);
}
}
+ static void test_srlc_add(short[] a0, short[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (short)((a1[i] + ADD_INIT)>>>VALUE);
+ }
+ }
+ static void test_srlv_add(short[] a0, short[] a1, int b) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (short)((a1[i] + b)>>>VALUE);
+ }
+ }
+ static void test_srlc_and(short[] a0, short[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (short)((a1[i] & BIT_MASK)>>>VALUE);
+ }
+ }
+ static void test_srlv_and(short[] a0, short[] a1, int b) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (short)((a1[i] & b)>>>VALUE);
+ }
+ }
static void test_srac(short[] a0, short[] a1) {
for (int i = 0; i < a0.length; i+=1) {
@@ -1020,6 +1213,26 @@
a0[i] = (short)(a1[i]>>b);
}
}
+ static void test_srac_add(short[] a0, short[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (short)((a1[i] + ADD_INIT)>>VALUE);
+ }
+ }
+ static void test_srav_add(short[] a0, short[] a1, int b) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (short)((a1[i] + b)>>VALUE);
+ }
+ }
+ static void test_srac_and(short[] a0, short[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (short)((a1[i] & BIT_MASK)>>VALUE);
+ }
+ }
+ static void test_srav_and(short[] a0, short[] a1, int b) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (short)((a1[i] & b)>>VALUE);
+ }
+ }
static void test_pack2(int[] p2, short[] a1) {
if (p2.length*2 > a1.length) return;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/compiler/8001183/TestCharVect.java Tue Oct 23 13:06:37 2012 -0700
@@ -0,0 +1,1332 @@
+/*
+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+/**
+ * @test
+ * @bug 8001183
+ * @summary incorrect results of char vectors right shift operaiton
+ *
+ * @run main/othervm/timeout=400 -Xbatch -Xmx64m TestCharVect
+ */
+
+public class TestCharVect {
+ private static final int ARRLEN = 997;
+ private static final int ITERS = 11000;
+ private static final int ADD_INIT = Character.MAX_VALUE-500;
+ private static final int BIT_MASK = 0xB731;
+ private static final int VALUE = 7;
+ private static final int SHIFT = 16;
+
+ public static void main(String args[]) {
+ System.out.println("Testing Char vectors");
+ int errn = test();
+ if (errn > 0) {
+ System.err.println("FAILED: " + errn + " errors");
+ System.exit(97);
+ }
+ System.out.println("PASSED");
+ }
+
+ static int test() {
+ char[] a0 = new char[ARRLEN];
+ char[] a1 = new char[ARRLEN];
+ short[] a2 = new short[ARRLEN];
+ short[] a3 = new short[ARRLEN];
+ short[] a4 = new short[ARRLEN];
+ int[] p2 = new int[ARRLEN/2];
+ long[] p4 = new long[ARRLEN/4];
+ // Initialize
+ int gold_sum = 0;
+ for (int i=0; i<ARRLEN; i++) {
+ char val = (char)(ADD_INIT+i);
+ gold_sum += val;
+ a1[i] = val;
+ a2[i] = VALUE;
+ a3[i] = -VALUE;
+ a4[i] = (short)BIT_MASK;
+ }
+ System.out.println("Warmup");
+ for (int i=0; i<ITERS; i++) {
+ test_sum(a1);
+ test_addc(a0, a1);
+ test_addv(a0, a1, (char)VALUE);
+ test_adda(a0, a1, a2);
+ test_subc(a0, a1);
+ test_subv(a0, a1, (char)VALUE);
+ test_suba(a0, a1, a2);
+
+ test_mulc(a0, a1);
+ test_mulv(a0, a1, (char)VALUE);
+ test_mula(a0, a1, a2);
+ test_divc(a0, a1);
+ test_divv(a0, a1, VALUE);
+ test_diva(a0, a1, a2);
+ test_mulc_n(a0, a1);
+ test_mulv(a0, a1, (char)-VALUE);
+ test_mula(a0, a1, a3);
+ test_divc_n(a0, a1);
+ test_divv(a0, a1, -VALUE);
+ test_diva(a0, a1, a3);
+
+ test_andc(a0, a1);
+ test_andv(a0, a1, (short)BIT_MASK);
+ test_anda(a0, a1, a4);
+ test_orc(a0, a1);
+ test_orv(a0, a1, (short)BIT_MASK);
+ test_ora(a0, a1, a4);
+ test_xorc(a0, a1);
+ test_xorv(a0, a1, (short)BIT_MASK);
+ test_xora(a0, a1, a4);
+
+ test_sllc(a0, a1);
+ test_sllv(a0, a1, VALUE);
+ test_srlc(a0, a1);
+ test_srlv(a0, a1, VALUE);
+ test_srac(a0, a1);
+ test_srav(a0, a1, VALUE);
+
+ test_sllc_n(a0, a1);
+ test_sllv(a0, a1, -VALUE);
+ test_srlc_n(a0, a1);
+ test_srlv(a0, a1, -VALUE);
+ test_srac_n(a0, a1);
+ test_srav(a0, a1, -VALUE);
+
+ test_sllc_o(a0, a1);
+ test_sllv(a0, a1, SHIFT);
+ test_srlc_o(a0, a1);
+ test_srlv(a0, a1, SHIFT);
+ test_srac_o(a0, a1);
+ test_srav(a0, a1, SHIFT);
+
+ test_sllc_on(a0, a1);
+ test_sllv(a0, a1, -SHIFT);
+ test_srlc_on(a0, a1);
+ test_srlv(a0, a1, -SHIFT);
+ test_srac_on(a0, a1);
+ test_srav(a0, a1, -SHIFT);
+
+ test_sllc_add(a0, a1);
+ test_sllv_add(a0, a1, ADD_INIT);
+ test_srlc_add(a0, a1);
+ test_srlv_add(a0, a1, ADD_INIT);
+ test_srac_add(a0, a1);
+ test_srav_add(a0, a1, ADD_INIT);
+
+ test_sllc_and(a0, a1);
+ test_sllv_and(a0, a1, BIT_MASK);
+ test_srlc_and(a0, a1);
+ test_srlv_and(a0, a1, BIT_MASK);
+ test_srac_and(a0, a1);
+ test_srav_and(a0, a1, BIT_MASK);
+
+ test_pack2(p2, a1);
+ test_unpack2(a0, p2);
+ test_pack2_swap(p2, a1);
+ test_unpack2_swap(a0, p2);
+ test_pack4(p4, a1);
+ test_unpack4(a0, p4);
+ test_pack4_swap(p4, a1);
+ test_unpack4_swap(a0, p4);
+ }
+ // Test and verify results
+ System.out.println("Verification");
+ int errn = 0;
+ {
+ int sum = test_sum(a1);
+ if (sum != gold_sum) {
+ System.err.println("test_sum: " + sum + " != " + gold_sum);
+ errn++;
+ }
+
+ test_addc(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_addc: ", i, a0[i], (char)((char)(ADD_INIT+i)+VALUE));
+ }
+ test_addv(a0, a1, (char)VALUE);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_addv: ", i, a0[i], (char)((char)(ADD_INIT+i)+VALUE));
+ }
+ test_adda(a0, a1, a2);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_adda: ", i, a0[i], (char)((char)(ADD_INIT+i)+VALUE));
+ }
+
+ test_subc(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_subc: ", i, a0[i], (char)((char)(ADD_INIT+i)-VALUE));
+ }
+ test_subv(a0, a1, (char)VALUE);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_subv: ", i, a0[i], (char)((char)(ADD_INIT+i)-VALUE));
+ }
+ test_suba(a0, a1, a2);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_suba: ", i, a0[i], (char)((char)(ADD_INIT+i)-VALUE));
+ }
+
+ test_mulc(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_mulc: ", i, a0[i], (char)((char)(ADD_INIT+i)*VALUE));
+ }
+ test_mulv(a0, a1, (char)VALUE);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_mulv: ", i, a0[i], (char)((char)(ADD_INIT+i)*VALUE));
+ }
+ test_mula(a0, a1, a2);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_mula: ", i, a0[i], (char)((char)(ADD_INIT+i)*VALUE));
+ }
+
+ test_divc(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_divc: ", i, a0[i], (char)((char)(ADD_INIT+i)/VALUE));
+ }
+ test_divv(a0, a1, VALUE);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_divv: ", i, a0[i], (char)((char)(ADD_INIT+i)/VALUE));
+ }
+ test_diva(a0, a1, a2);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_diva: ", i, a0[i], (char)((char)(ADD_INIT+i)/VALUE));
+ }
+
+ test_mulc_n(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_mulc_n: ", i, a0[i], (char)((char)(ADD_INIT+i)*(-VALUE)));
+ }
+ test_mulv(a0, a1, (char)-VALUE);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_mulv_n: ", i, a0[i], (char)((char)(ADD_INIT+i)*(-VALUE)));
+ }
+ test_mula(a0, a1, a3);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_mula_n: ", i, a0[i], (char)((char)(ADD_INIT+i)*(-VALUE)));
+ }
+
+ test_divc_n(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_divc_n: ", i, a0[i], (char)((char)(ADD_INIT+i)/(-VALUE)));
+ }
+ test_divv(a0, a1, -VALUE);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_divv_n: ", i, a0[i], (char)((char)(ADD_INIT+i)/(-VALUE)));
+ }
+ test_diva(a0, a1, a3);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_diva_n: ", i, a0[i], (char)((char)(ADD_INIT+i)/(-VALUE)));
+ }
+
+ test_andc(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_andc: ", i, a0[i], (char)((char)(ADD_INIT+i)&BIT_MASK));
+ }
+ test_andv(a0, a1, (short)BIT_MASK);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_andv: ", i, a0[i], (char)((char)(ADD_INIT+i)&BIT_MASK));
+ }
+ test_anda(a0, a1, a4);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_anda: ", i, a0[i], (char)((char)(ADD_INIT+i)&BIT_MASK));
+ }
+
+ test_orc(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_orc: ", i, a0[i], (char)((char)(ADD_INIT+i)|BIT_MASK));
+ }
+ test_orv(a0, a1, (short)BIT_MASK);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_orv: ", i, a0[i], (char)((char)(ADD_INIT+i)|BIT_MASK));
+ }
+ test_ora(a0, a1, a4);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_ora: ", i, a0[i], (char)((char)(ADD_INIT+i)|BIT_MASK));
+ }
+
+ test_xorc(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_xorc: ", i, a0[i], (char)((char)(ADD_INIT+i)^BIT_MASK));
+ }
+ test_xorv(a0, a1, (short)BIT_MASK);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_xorv: ", i, a0[i], (char)((char)(ADD_INIT+i)^BIT_MASK));
+ }
+ test_xora(a0, a1, a4);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_xora: ", i, a0[i], (char)((char)(ADD_INIT+i)^BIT_MASK));
+ }
+
+ test_sllc(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_sllc: ", i, a0[i], (char)((char)(ADD_INIT+i)<<VALUE));
+ }
+ test_sllv(a0, a1, VALUE);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_sllv: ", i, a0[i], (char)((char)(ADD_INIT+i)<<VALUE));
+ }
+
+ test_srlc(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srlc: ", i, a0[i], (char)((char)(ADD_INIT+i)>>>VALUE));
+ }
+ test_srlv(a0, a1, VALUE);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srlv: ", i, a0[i], (char)((char)(ADD_INIT+i)>>>VALUE));
+ }
+
+ test_srac(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srac: ", i, a0[i], (char)((char)(ADD_INIT+i)>>VALUE));
+ }
+ test_srav(a0, a1, VALUE);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srav: ", i, a0[i], (char)((char)(ADD_INIT+i)>>VALUE));
+ }
+
+ test_sllc_n(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_sllc_n: ", i, a0[i], (char)((char)(ADD_INIT+i)<<(-VALUE)));
+ }
+ test_sllv(a0, a1, -VALUE);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_sllv_n: ", i, a0[i], (char)((char)(ADD_INIT+i)<<(-VALUE)));
+ }
+
+ test_srlc_n(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srlc_n: ", i, a0[i], (char)((char)(ADD_INIT+i)>>>(-VALUE)));
+ }
+ test_srlv(a0, a1, -VALUE);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srlv_n: ", i, a0[i], (char)((char)(ADD_INIT+i)>>>(-VALUE)));
+ }
+
+ test_srac_n(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srac_n: ", i, a0[i], (char)((char)(ADD_INIT+i)>>(-VALUE)));
+ }
+ test_srav(a0, a1, -VALUE);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srav_n: ", i, a0[i], (char)((char)(ADD_INIT+i)>>(-VALUE)));
+ }
+
+ test_sllc_o(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_sllc_o: ", i, a0[i], (char)((char)(ADD_INIT+i)<<SHIFT));
+ }
+ test_sllv(a0, a1, SHIFT);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_sllv_o: ", i, a0[i], (char)((char)(ADD_INIT+i)<<SHIFT));
+ }
+
+ test_srlc_o(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srlc_o: ", i, a0[i], (char)((char)(ADD_INIT+i)>>>SHIFT));
+ }
+ test_srlv(a0, a1, SHIFT);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srlv_o: ", i, a0[i], (char)((char)(ADD_INIT+i)>>>SHIFT));
+ }
+
+ test_srac_o(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srac_o: ", i, a0[i], (char)((char)(ADD_INIT+i)>>SHIFT));
+ }
+ test_srav(a0, a1, SHIFT);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srav_o: ", i, a0[i], (char)((char)(ADD_INIT+i)>>SHIFT));
+ }
+
+ test_sllc_on(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_sllc_on: ", i, a0[i], (char)((char)(ADD_INIT+i)<<(-SHIFT)));
+ }
+ test_sllv(a0, a1, -SHIFT);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_sllv_on: ", i, a0[i], (char)((char)(ADD_INIT+i)<<(-SHIFT)));
+ }
+
+ test_srlc_on(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srlc_on: ", i, a0[i], (char)((char)(ADD_INIT+i)>>>(-SHIFT)));
+ }
+ test_srlv(a0, a1, -SHIFT);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srlv_on: ", i, a0[i], (char)((char)(ADD_INIT+i)>>>(-SHIFT)));
+ }
+
+ test_srac_on(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srac_on: ", i, a0[i], (char)((char)(ADD_INIT+i)>>(-SHIFT)));
+ }
+ test_srav(a0, a1, -SHIFT);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srav_on: ", i, a0[i], (char)((char)(ADD_INIT+i)>>(-SHIFT)));
+ }
+
+ test_sllc_add(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_sllc_add: ", i, a0[i], (char)(((char)(ADD_INIT+i) + ADD_INIT)<<VALUE));
+ }
+ test_sllv_add(a0, a1, ADD_INIT);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_sllv_add: ", i, a0[i], (char)(((char)(ADD_INIT+i) + ADD_INIT)<<VALUE));
+ }
+
+ test_srlc_add(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srlc_add: ", i, a0[i], (char)(((char)(ADD_INIT+i) + ADD_INIT)>>>VALUE));
+ }
+ test_srlv_add(a0, a1, ADD_INIT);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srlv_add: ", i, a0[i], (char)(((char)(ADD_INIT+i) + ADD_INIT)>>>VALUE));
+ }
+
+ test_srac_add(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srac_add: ", i, a0[i], (char)(((char)(ADD_INIT+i) + ADD_INIT)>>VALUE));
+ }
+ test_srav_add(a0, a1, ADD_INIT);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srav_add: ", i, a0[i], (char)(((char)(ADD_INIT+i) + ADD_INIT)>>VALUE));
+ }
+
+ test_sllc_and(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_sllc_and: ", i, a0[i], (char)(((char)(ADD_INIT+i) & BIT_MASK)<<VALUE));
+ }
+ test_sllv_and(a0, a1, BIT_MASK);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_sllv_and: ", i, a0[i], (char)(((char)(ADD_INIT+i) & BIT_MASK)<<VALUE));
+ }
+
+ test_srlc_and(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srlc_and: ", i, a0[i], (char)(((char)(ADD_INIT+i) & BIT_MASK)>>>VALUE));
+ }
+ test_srlv_and(a0, a1, BIT_MASK);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srlv_and: ", i, a0[i], (char)(((char)(ADD_INIT+i) & BIT_MASK)>>>VALUE));
+ }
+
+ test_srac_and(a0, a1);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srac_and: ", i, a0[i], (char)(((char)(ADD_INIT+i) & BIT_MASK)>>VALUE));
+ }
+ test_srav_and(a0, a1, BIT_MASK);
+ for (int i=0; i<ARRLEN; i++) {
+ errn += verify("test_srav_and: ", i, a0[i], (char)(((char)(ADD_INIT+i) & BIT_MASK)>>VALUE));
+ }
+
+ test_pack2(p2, a1);
+ for (int i=0; i<ARRLEN/2; i++) {
+ errn += verify("test_pack2: ", i, p2[i], ((int)(ADD_INIT+2*i) & 0xFFFF) | ((int)(ADD_INIT+2*i+1) << 16));
+ }
+ for (int i=0; i<ARRLEN; i++) {
+ a0[i] = (char)-1;
+ }
+ test_unpack2(a0, p2);
+ for (int i=0; i<(ARRLEN&(-2)); i++) {
+ errn += verify("test_unpack2: ", i, a0[i], (char)(ADD_INIT+i));
+ }
+
+ test_pack2_swap(p2, a1);
+ for (int i=0; i<ARRLEN/2; i++) {
+ errn += verify("test_pack2_swap: ", i, p2[i], ((int)(ADD_INIT+2*i+1) & 0xFFFF) | ((int)(ADD_INIT+2*i) << 16));
+ }
+ for (int i=0; i<ARRLEN; i++) {
+ a0[i] = (char)-1;
+ }
+ test_unpack2_swap(a0, p2);
+ for (int i=0; i<(ARRLEN&(-2)); i++) {
+ errn += verify("test_unpack2_swap: ", i, a0[i], (char)(ADD_INIT+i));
+ }
+
+ test_pack4(p4, a1);
+ for (int i=0; i<ARRLEN/4; i++) {
+ errn += verify("test_pack4: ", i, p4[i], ((long)(ADD_INIT+4*i+0) & 0xFFFFl) |
+ (((long)(ADD_INIT+4*i+1) & 0xFFFFl) << 16) |
+ (((long)(ADD_INIT+4*i+2) & 0xFFFFl) << 32) |
+ (((long)(ADD_INIT+4*i+3) & 0xFFFFl) << 48));
+ }
+ for (int i=0; i<ARRLEN; i++) {
+ a0[i] = (char)-1;
+ }
+ test_unpack4(a0, p4);
+ for (int i=0; i<(ARRLEN&(-4)); i++) {
+ errn += verify("test_unpack4: ", i, a0[i], (char)(ADD_INIT+i));
+ }
+
+ test_pack4_swap(p4, a1);
+ for (int i=0; i<ARRLEN/4; i++) {
+ errn += verify("test_pack4_swap: ", i, p4[i], ((long)(ADD_INIT+4*i+3) & 0xFFFFl) |
+ (((long)(ADD_INIT+4*i+2) & 0xFFFFl) << 16) |
+ (((long)(ADD_INIT+4*i+1) & 0xFFFFl) << 32) |
+ (((long)(ADD_INIT+4*i+0) & 0xFFFFl) << 48));
+ }
+ for (int i=0; i<ARRLEN; i++) {
+ a0[i] = (char)-1;
+ }
+ test_unpack4_swap(a0, p4);
+ for (int i=0; i<(ARRLEN&(-4)); i++) {
+ errn += verify("test_unpack4_swap: ", i, a0[i], (char)(ADD_INIT+i));
+ }
+
+ }
+
+ if (errn > 0)
+ return errn;
+
+ System.out.println("Time");
+ long start, end;
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_sum(a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_sum: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_addc(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_addc: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_addv(a0, a1, (char)VALUE);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_addv: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_adda(a0, a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_adda: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_subc(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_subc: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_subv(a0, a1, (char)VALUE);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_subv: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_suba(a0, a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_suba: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_mulc(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_mulc: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_mulv(a0, a1, (char)VALUE);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_mulv: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_mula(a0, a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_mula: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_divc(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_divc: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_divv(a0, a1, VALUE);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_divv: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_diva(a0, a1, a2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_diva: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_mulc_n(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_mulc_n: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_mulv(a0, a1, (char)-VALUE);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_mulv_n: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_mula(a0, a1, a3);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_mula_n: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_divc_n(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_divc_n: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_divv(a0, a1, -VALUE);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_divv_n: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_diva(a0, a1, a3);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_diva_n: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_andc(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_andc: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_andv(a0, a1, (short)BIT_MASK);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_andv: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_anda(a0, a1, a4);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_anda: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_orc(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_orc: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_orv(a0, a1, (short)BIT_MASK);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_orv: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_ora(a0, a1, a4);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_ora: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_xorc(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_xorc: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_xorv(a0, a1, (short)BIT_MASK);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_xorv: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_xora(a0, a1, a4);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_xora: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_sllc(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_sllc: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_sllv(a0, a1, VALUE);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_sllv: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srlc(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srlc: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srlv(a0, a1, VALUE);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srlv: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srac(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srac: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srav(a0, a1, VALUE);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srav: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_sllc_n(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_sllc_n: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_sllv(a0, a1, -VALUE);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_sllv_n: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srlc_n(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srlc_n: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srlv(a0, a1, -VALUE);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srlv_n: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srac_n(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srac_n: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srav(a0, a1, -VALUE);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srav_n: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_sllc_o(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_sllc_o: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_sllv(a0, a1, SHIFT);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_sllv_o: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srlc_o(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srlc_o: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srlv(a0, a1, SHIFT);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srlv_o: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srac_o(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srac_o: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srav(a0, a1, SHIFT);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srav_o: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_sllc_on(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_sllc_on: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_sllv(a0, a1, -SHIFT);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_sllv_on: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srlc_on(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srlc_on: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srlv(a0, a1, -SHIFT);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srlv_on: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srac_on(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srac_on: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srav(a0, a1, -SHIFT);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srav_on: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_sllc_add(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_sllc_add: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_sllv_add(a0, a1, ADD_INIT);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_sllv_add: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srlc_add(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srlc_add: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srlv_add(a0, a1, ADD_INIT);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srlv_add: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srac_add(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srac_add: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srav_add(a0, a1, ADD_INIT);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srav_add: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_sllc_and(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_sllc_and: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_sllv_and(a0, a1, BIT_MASK);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_sllv_and: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srlc_and(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srlc_and: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srlv_and(a0, a1, BIT_MASK);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srlv_and: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srac_and(a0, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srac_and: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_srav_and(a0, a1, BIT_MASK);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_srav_and: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_pack2(p2, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_pack2: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_unpack2(a0, p2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_unpack2: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_pack2_swap(p2, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_pack2_swap: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_unpack2_swap(a0, p2);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_unpack2_swap: " + (end - start));
+
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_pack4(p4, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_pack4: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_unpack4(a0, p4);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_unpack4: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_pack4_swap(p4, a1);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_pack4_swap: " + (end - start));
+ start = System.currentTimeMillis();
+ for (int i=0; i<ITERS; i++) {
+ test_unpack4_swap(a0, p4);
+ }
+ end = System.currentTimeMillis();
+ System.out.println("test_unpack4_swap: " + (end - start));
+
+ return errn;
+ }
+
+ static int test_sum(char[] a1) {
+ int sum = 0;
+ for (int i = 0; i < a1.length; i+=1) {
+ sum += a1[i];
+ }
+ return sum;
+ }
+
+ static void test_addc(char[] a0, char[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)(a1[i]+VALUE);
+ }
+ }
+ static void test_addv(char[] a0, char[] a1, char b) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)(a1[i]+b);
+ }
+ }
+ static void test_adda(char[] a0, char[] a1, short[] a2) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)(a1[i]+a2[i]);
+ }
+ }
+
+ static void test_subc(char[] a0, char[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)(a1[i]-VALUE);
+ }
+ }
+ static void test_subv(char[] a0, char[] a1, char b) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)(a1[i]-b);
+ }
+ }
+ static void test_suba(char[] a0, char[] a1, short[] a2) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)(a1[i]-a2[i]);
+ }
+ }
+
+ static void test_mulc(char[] a0, char[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)(a1[i]*VALUE);
+ }
+ }
+ static void test_mulc_n(char[] a0, char[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)(a1[i]*(-VALUE));
+ }
+ }
+ static void test_mulv(char[] a0, char[] a1, char b) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)(a1[i]*b);
+ }
+ }
+ static void test_mula(char[] a0, char[] a1, short[] a2) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)(a1[i]*a2[i]);
+ }
+ }
+
+ static void test_divc(char[] a0, char[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)(a1[i]/VALUE);
+ }
+ }
+ static void test_divc_n(char[] a0, char[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)(a1[i]/(-VALUE));
+ }
+ }
+ static void test_divv(char[] a0, char[] a1, int b) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)(a1[i]/b);
+ }
+ }
+ static void test_diva(char[] a0, char[] a1, short[] a2) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)(a1[i]/a2[i]);
+ }
+ }
+
+ static void test_andc(char[] a0, char[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)(a1[i]&BIT_MASK);
+ }
+ }
+ static void test_andv(char[] a0, char[] a1, short b) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)(a1[i]&b);
+ }
+ }
+ static void test_anda(char[] a0, char[] a1, short[] a2) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)(a1[i]&a2[i]);
+ }
+ }
+
+ static void test_orc(char[] a0, char[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)(a1[i]|BIT_MASK);
+ }
+ }
+ static void test_orv(char[] a0, char[] a1, short b) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)(a1[i]|b);
+ }
+ }
+ static void test_ora(char[] a0, char[] a1, short[] a2) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)(a1[i]|a2[i]);
+ }
+ }
+
+ static void test_xorc(char[] a0, char[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)(a1[i]^BIT_MASK);
+ }
+ }
+ static void test_xorv(char[] a0, char[] a1, short b) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)(a1[i]^b);
+ }
+ }
+ static void test_xora(char[] a0, char[] a1, short[] a2) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)(a1[i]^a2[i]);
+ }
+ }
+
+ static void test_sllc(char[] a0, char[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)(a1[i]<<VALUE);
+ }
+ }
+ static void test_sllc_n(char[] a0, char[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)(a1[i]<<(-VALUE));
+ }
+ }
+ static void test_sllc_o(char[] a0, char[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)(a1[i]<<SHIFT);
+ }
+ }
+ static void test_sllc_on(char[] a0, char[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)(a1[i]<<(-SHIFT));
+ }
+ }
+ static void test_sllv(char[] a0, char[] a1, int b) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)(a1[i]<<b);
+ }
+ }
+ static void test_sllc_add(char[] a0, char[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)((a1[i] + ADD_INIT)<<VALUE);
+ }
+ }
+ static void test_sllv_add(char[] a0, char[] a1, int b) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)((a1[i] + b)<<VALUE);
+ }
+ }
+ static void test_sllc_and(char[] a0, char[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)((a1[i] & BIT_MASK)<<VALUE);
+ }
+ }
+ static void test_sllv_and(char[] a0, char[] a1, int b) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)((a1[i] & b)<<VALUE);
+ }
+ }
+
+ static void test_srlc(char[] a0, char[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)(a1[i]>>>VALUE);
+ }
+ }
+ static void test_srlc_n(char[] a0, char[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)(a1[i]>>>(-VALUE));
+ }
+ }
+ static void test_srlc_o(char[] a0, char[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)(a1[i]>>>SHIFT);
+ }
+ }
+ static void test_srlc_on(char[] a0, char[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)(a1[i]>>>(-SHIFT));
+ }
+ }
+ static void test_srlv(char[] a0, char[] a1, int b) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)(a1[i]>>>b);
+ }
+ }
+ static void test_srlc_add(char[] a0, char[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)((a1[i] + ADD_INIT)>>>VALUE);
+ }
+ }
+ static void test_srlv_add(char[] a0, char[] a1, int b) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)((a1[i] + b)>>>VALUE);
+ }
+ }
+ static void test_srlc_and(char[] a0, char[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)((a1[i] & BIT_MASK)>>>VALUE);
+ }
+ }
+ static void test_srlv_and(char[] a0, char[] a1, int b) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)((a1[i] & b)>>>VALUE);
+ }
+ }
+
+ static void test_srac(char[] a0, char[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)(a1[i]>>VALUE);
+ }
+ }
+ static void test_srac_n(char[] a0, char[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)(a1[i]>>(-VALUE));
+ }
+ }
+ static void test_srac_o(char[] a0, char[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)(a1[i]>>SHIFT);
+ }
+ }
+ static void test_srac_on(char[] a0, char[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)(a1[i]>>(-SHIFT));
+ }
+ }
+ static void test_srav(char[] a0, char[] a1, int b) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)(a1[i]>>b);
+ }
+ }
+ static void test_srac_add(char[] a0, char[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)((a1[i] + ADD_INIT)>>VALUE);
+ }
+ }
+ static void test_srav_add(char[] a0, char[] a1, int b) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)((a1[i] + b)>>VALUE);
+ }
+ }
+ static void test_srac_and(char[] a0, char[] a1) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)((a1[i] & BIT_MASK)>>VALUE);
+ }
+ }
+ static void test_srav_and(char[] a0, char[] a1, int b) {
+ for (int i = 0; i < a0.length; i+=1) {
+ a0[i] = (char)((a1[i] & b)>>VALUE);
+ }
+ }
+
+ static void test_pack2(int[] p2, char[] a1) {
+ if (p2.length*2 > a1.length) return;
+ for (int i = 0; i < p2.length; i+=1) {
+ int l0 = (int)a1[i*2+0];
+ int l1 = (int)a1[i*2+1];
+ p2[i] = (l1 << 16) | (l0 & 0xFFFF);
+ }
+ }
+ static void test_unpack2(char[] a0, int[] p2) {
+ if (p2.length*2 > a0.length) return;
+ for (int i = 0; i < p2.length; i+=1) {
+ int l = p2[i];
+ a0[i*2+0] = (char)(l & 0xFFFF);
+ a0[i*2+1] = (char)(l >> 16);
+ }
+ }
+ static void test_pack2_swap(int[] p2, char[] a1) {
+ if (p2.length*2 > a1.length) return;
+ for (int i = 0; i < p2.length; i+=1) {
+ int l0 = (int)a1[i*2+0];
+ int l1 = (int)a1[i*2+1];
+ p2[i] = (l0 << 16) | (l1 & 0xFFFF);
+ }
+ }
+ static void test_unpack2_swap(char[] a0, int[] p2) {
+ if (p2.length*2 > a0.length) return;
+ for (int i = 0; i < p2.length; i+=1) {
+ int l = p2[i];
+ a0[i*2+0] = (char)(l >> 16);
+ a0[i*2+1] = (char)(l & 0xFFFF);
+ }
+ }
+
+ static void test_pack4(long[] p4, char[] a1) {
+ if (p4.length*4 > a1.length) return;
+ for (int i = 0; i < p4.length; i+=1) {
+ long l0 = (long)a1[i*4+0];
+ long l1 = (long)a1[i*4+1];
+ long l2 = (long)a1[i*4+2];
+ long l3 = (long)a1[i*4+3];
+ p4[i] = (l0 & 0xFFFFl) |
+ ((l1 & 0xFFFFl) << 16) |
+ ((l2 & 0xFFFFl) << 32) |
+ ((l3 & 0xFFFFl) << 48);
+ }
+ }
+ static void test_unpack4(char[] a0, long[] p4) {
+ if (p4.length*4 > a0.length) return;
+ for (int i = 0; i < p4.length; i+=1) {
+ long l = p4[i];
+ a0[i*4+0] = (char)(l & 0xFFFFl);
+ a0[i*4+1] = (char)(l >> 16);
+ a0[i*4+2] = (char)(l >> 32);
+ a0[i*4+3] = (char)(l >> 48);
+ }
+ }
+ static void test_pack4_swap(long[] p4, char[] a1) {
+ if (p4.length*4 > a1.length) return;
+ for (int i = 0; i < p4.length; i+=1) {
+ long l0 = (long)a1[i*4+0];
+ long l1 = (long)a1[i*4+1];
+ long l2 = (long)a1[i*4+2];
+ long l3 = (long)a1[i*4+3];
+ p4[i] = (l3 & 0xFFFFl) |
+ ((l2 & 0xFFFFl) << 16) |
+ ((l1 & 0xFFFFl) << 32) |
+ ((l0 & 0xFFFFl) << 48);
+ }
+ }
+ static void test_unpack4_swap(char[] a0, long[] p4) {
+ if (p4.length*4 > a0.length) return;
+ for (int i = 0; i < p4.length; i+=1) {
+ long l = p4[i];
+ a0[i*4+0] = (char)(l >> 48);
+ a0[i*4+1] = (char)(l >> 32);
+ a0[i*4+2] = (char)(l >> 16);
+ a0[i*4+3] = (char)(l & 0xFFFFl);
+ }
+ }
+
+ static int verify(String text, int i, int elem, int val) {
+ if (elem != val) {
+ System.err.println(text + "[" + i + "] = " + elem + " != " + val);
+ return 1;
+ }
+ return 0;
+ }
+
+ static int verify(String text, int i, long elem, long val) {
+ if (elem != val) {
+ System.err.println(text + "[" + i + "] = " + Long.toHexString(elem) + " != " + Long.toHexString(val));
+ return 1;
+ }
+ return 0;
+ }
+}