diff options
| author | Dmitriy Ivanov <dimitry@google.com> | 2014-05-23 18:17:26 -0700 |
|---|---|---|
| committer | Dmitriy Ivanov <dimitry@google.com> | 2014-05-23 18:17:26 -0700 |
| commit | c891ee64c7a8db29501d09892eb639a016fa674b (patch) | |
| tree | 7ce0e33bb750f0c9fee6810b0cc79c7c3f07f6d5 /main | |
| parent | ac95db8343ddb5728ba34e4aab25bbcd3233e676 (diff) | |
| download | valgrind-c891ee64c7a8db29501d09892eb639a016fa674b.tar.gz | |
Enable arm64 bit tests
* fix compilation errors for integer.c
* add scripts to run arm/arm64 test variants
Change-Id: Ie33fc50c7828d784163c11cc671af3dcfa0c54da
Diffstat (limited to 'main')
| -rw-r--r-- | main/Android.mk | 7 | ||||
| -rw-r--r-- | main/Android.test.mk | 4 | ||||
| -rw-r--r-- | main/none/tests/arm64/integer.c | 12 | ||||
| -rw-r--r-- | main/none/tests/arm64/test_arm64_fp_and_simd.c | 0 | ||||
| -rw-r--r-- | main/none/tests/arm64/test_arm64_int.c | 0 |
5 files changed, 15 insertions, 8 deletions
diff --git a/main/Android.mk b/main/Android.mk index 7cc8cebc0..11abb96c5 100644 --- a/main/Android.mk +++ b/main/Android.mk @@ -583,6 +583,13 @@ test := v6intThumb include $(LOCAL_PATH)/Android.test.mk endif +ifeq ($(TARGET_ARCH),arm64) +test := integer +include $(LOCAL_PATH)/Android.test.mk +test := fp_and_simd +include $(LOCAL_PATH)/Android.test.mk +endif + # Copy prebuilt suppressions include $(CLEAR_VARS) LOCAL_MODULE := default.supp diff --git a/main/Android.test.mk b/main/Android.test.mk index 0197b3c70..a77530949 100644 --- a/main/Android.test.mk +++ b/main/Android.test.mk @@ -1,6 +1,6 @@ include $(CLEAR_VARS) -LOCAL_MODULE=$(test) -LOCAL_SRC_FILES=none/tests/arm/$(test).c +LOCAL_MODULE=vg-$(test) +LOCAL_SRC_FILES=none/tests/$(TARGET_ARCH)/$(test).c include $(BUILD_NATIVE_TEST) diff --git a/main/none/tests/arm64/integer.c b/main/none/tests/arm64/integer.c index 7addadaaf..f1252f302 100644 --- a/main/none/tests/arm64/integer.c +++ b/main/none/tests/arm64/integer.c @@ -419,8 +419,8 @@ TESTINST2("ands x3,x4, #0x8080808080808080", 0x7070707070707070, x3, x4, 0); TESTINST2("ands x3,x4, #0x8080808080808080", 0xF070707070707070, x3, x4, 0); TESTINST2("and w3,w4, #0xF", ALL5s, x3, x4, 0); -TESTINST2("and w3,w4, #0x8080808080808080", 0x843fdf810277796e, x3, x4, 0); -TESTINST2("and w3,w4, #0xC0C0C0C0C0C0C0C0", 0xc5446fe48c610b28, x3, x4, 0); +TESTINST2("and w3,w4, #0x80808080", 0x843fdf810277796e, x3, x4, 0); +TESTINST2("and w3,w4, #0xC0C0C0C0", 0xc5446fe48c610b28, x3, x4, 0); TESTINST2("ands w3,w4, #0x80808080", 0x843fdf810277796e, x3, x4, 0); TESTINST2("ands w3,w4, #0xC0C0C0C0", 0xc5446fe48c610b28, x3, x4, 0); TESTINST2("ands w3,w4, #0x80808080", 0x143fdf810277796e, x3, x4, 0); @@ -435,8 +435,8 @@ TESTINST2("orr x3,x4, #0x8080808080808080", 0x843fdf810277796e, x3, x4, 0); TESTINST2("orr x3,x4, #0xC0C0C0C0C0C0C0C0", 0xc5446fe48c610b28, x3, x4, 0); TESTINST2("orr w3,w4, #0xF", ALL5s, x3, x4, 0); -TESTINST2("orr w3,w4, #0x8080808080808080", 0x843fdf810277796e, x3, x4, 0); -TESTINST2("orr w3,w4, #0xC0C0C0C0C0C0C0C0", 0xc5446fe48c610b28, x3, x4, 0); +TESTINST2("orr w3,w4, #0x80808080", 0x843fdf810277796e, x3, x4, 0); +TESTINST2("orr w3,w4, #0xC0C0C0C0", 0xc5446fe48c610b28, x3, x4, 0); //////////////////////////////////////////////////////////////// printf("EOR(imm)\n"); @@ -445,8 +445,8 @@ TESTINST2("eor x3,x4, #0x8080808080808080", 0x843fdf810277796e, x3, x4, 0); TESTINST2("eor x3,x4, #0xC0C0C0C0C0C0C0C0", 0xc5446fe48c610b28, x3, x4, 0); TESTINST2("eor w3,w4, #0xF", ALL5s, x3, x4, 0); -TESTINST2("eor w3,w4, #0x8080808080808080", 0x843fdf810277796e, x3, x4, 0); -TESTINST2("eor w3,w4, #0xC0C0C0C0C0C0C0C0", 0xc5446fe48c610b28, x3, x4, 0); +TESTINST2("eor w3,w4, #0x80808080", 0x843fdf810277796e, x3, x4, 0); +TESTINST2("eor w3,w4, #0xC0C0C0C0", 0xc5446fe48c610b28, x3, x4, 0); //////////////////////////////////////////////////////////////// printf("MOVZ\n"); diff --git a/main/none/tests/arm64/test_arm64_fp_and_simd.c b/main/none/tests/arm64/test_arm64_fp_and_simd.c deleted file mode 100644 index e69de29bb..000000000 --- a/main/none/tests/arm64/test_arm64_fp_and_simd.c +++ /dev/null diff --git a/main/none/tests/arm64/test_arm64_int.c b/main/none/tests/arm64/test_arm64_int.c deleted file mode 100644 index e69de29bb..000000000 --- a/main/none/tests/arm64/test_arm64_int.c +++ /dev/null |