Convert arm-neon-tests to Android.bp

am: a0b9d7a1d9

Change-Id: I4fbd027672f8df3702dcc61767c2197fee7d324e

2 files changed, 200 insertions, 82 deletions

diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..40fd9ac
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,200 @@
+//
+// Copyright (C) 2016 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+cc_defaults {
+    name: "arm_neon_tests_defaults",
+    cflags: [
+        "-DREFFILE=\"stm-arm-neon.gccarm\"",
+        "-DGCCTESTS_FILE=\"expected_input4gcc.txt\"",
+
+        "-Wall",
+        "-Werror",
+        "-Wno-format",
+        "-Wno-ignored-qualifiers",
+        "-Wno-uninitialized",
+        "-Wno-unused-function",
+        "-Wno-unused-variable",
+    ],
+
+    srcs: [
+        "compute_ref.c",
+
+        // List of validated intrinsics (copy-pasted from Makefile)
+        "ref_vld1.c",
+        "ref_vadd.c",
+        "ref_vld1_lane.c",
+        "ref_vld1_dup.c",
+        "ref_vdup.c",
+        "ref_vget_high.c",
+        "ref_vget_low.c",
+        "ref_vqdmlal_lane.c",
+        "ref_vqdmlsl_lane.c",
+        "ref_vext.c",
+        "ref_vshrn_n.c",
+        "ref_vset_lane.c",
+        "ref_vget_lane.c",
+        "ref_vqsub.c",
+        "ref_vqdmulh_lane.c",
+        "ref_vqdmull.c",
+        "ref_vqdmlal.c",
+        "ref_vqdmlsl.c",
+        "ref_vceq.c",
+        "ref_vcge.c",
+        "ref_vcle.c",
+        "ref_vcgt.c",
+        "ref_vclt.c",
+        "ref_vbsl.c",
+        "ref_vshl.c",
+        "ref_vdup_lane.c",
+        "ref_vrshrn_n.c",
+        "ref_vqdmull_lane.c",
+        "ref_vst1_lane.c",
+        "ref_vqshl.c",
+        "ref_vqshl_n.c",
+        "ref_vqrshrn_n.c",
+        "ref_vsub.c",
+        "ref_vqadd.c",
+        "ref_vabs.c",
+        "ref_vqabs.c",
+        "ref_vcombine.c",
+        "ref_vmax.c",
+        "ref_vmin.c",
+        "ref_vneg.c",
+        "ref_vqneg.c",
+        "ref_vmlal.c",
+        "ref_vmlal_lane.c",
+        "ref_vmlsl.c",
+        "ref_vmlsl_lane.c",
+        "ref_vmovl.c",
+        "ref_vmovn.c",
+        "ref_vmull.c",
+        "ref_vmull_lane.c",
+        "ref_vrev.c",
+        "ref_vrshl.c",
+        "ref_vshl_n.c",
+        "ref_vshr_n.c",
+        "ref_vsra_n.c",
+        "ref_vtrn.c",
+        "ref_vuzp.c",
+        "ref_vzip.c",
+        "ref_vreinterpret.c",
+        "ref_vqdmulh.c",
+        "ref_vqrdmulh.c",
+        "ref_vqrdmulh_lane.c",
+        "ref_vqrshl.c",
+        "ref_vaba.c",
+        "ref_vabal.c",
+        "ref_vabd.c",
+        "ref_vabdl.c",
+        "ref_vand.c",
+        "ref_vorr.c",
+        "ref_vorn.c",
+        "ref_veor.c",
+        "ref_vbic.c",
+        "ref_vcreate.c",
+        "ref_vldX_lane.c",
+        "ref_vmla.c",
+        "ref_vmls.c",
+        "ref_vmul.c",
+        "ref_vmul_lane.c",
+        "ref_vmul_n.c",
+        "ref_vmull_n.c",
+        "ref_vqdmulh_n.c",
+        "ref_vqdmull_n.c",
+        "ref_vqrdmulh_n.c",
+        "ref_vmla_lane.c",
+        "ref_vmls_lane.c",
+        "ref_vmla_n.c",
+        "ref_vmls_n.c",
+        "ref_vmlal_n.c",
+        "ref_vmlsl_n.c",
+        "ref_vqdmlal_n.c",
+        "ref_vqdmlsl_n.c",
+        "ref_vsri_n.c",
+        "ref_vsli_n.c",
+        "ref_vtst.c",
+        "ref_vaddhn.c",
+        "ref_vraddhn.c",
+        "ref_vaddl.c",
+        "ref_vaddw.c",
+        "ref_vhadd.c",
+        "ref_vrhadd.c",
+        "ref_vhsub.c",
+        "ref_vsubl.c",
+        "ref_vsubw.c",
+        "ref_vsubhn.c",
+        "ref_vrsubhn.c",
+        "ref_vmvn.c",
+        "ref_vqmovn.c",
+        "ref_vqmovun.c",
+        "ref_vrshr_n.c",
+        "ref_vrsra_n.c",
+        "ref_vshll_n.c",
+        "ref_vpaddl.c",
+        "ref_vpadd.c",
+        "ref_vpadal.c",
+        "ref_vqshlu_n.c",
+        "ref_vclz.c",
+        "ref_vcls.c",
+        "ref_vcnt.c",
+        "ref_vqshrn_n.c",
+        "ref_vpmax.c",
+        "ref_vpmin.c",
+        "ref_vqshrun_n.c",
+        "ref_vqrshrun_n.c",
+        "ref_vstX_lane.c",
+        "ref_vtbX.c",
+        "ref_vrecpe.c",
+        "ref_vrsqrte.c",
+        "ref_vcage.c",
+        "ref_vcagt.c",
+        "ref_vcale.c",
+        "ref_vcalt.c",
+        "ref_vrecps.c",
+        "ref_vrsqrts.c",
+        "ref_vcvt.c",
+    ],
+    stl: "none",
+
+    enabled: false,
+    arch: {
+        arm: {
+            neon: {
+                enabled: true,
+            },
+        },
+    },
+}
+
+cc_test {
+    name: "arm_neon_tests_arm",
+    defaults: ["arm_neon_tests_defaults"],
+
+    arch: {
+        arm: {
+            instruction_set: "arm",
+        },
+    },
+}
+
+cc_test {
+    name: "arm_neon_tests_thumb",
+    arch: {
+        arm: {
+            instruction_set: "thumb",
+        },
+    },
+}
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index 2dfc488..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,82 +0,0 @@
-#
-# Copyright (C) 2016 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-ifeq ($(ARCH_ARM_HAVE_NEON),true)
-
-LOCAL_PATH := $(call my-dir)
-
-# List of validated intrinsics (copy-pasted from Makefile)
-ARM_NEON_TESTS_REFNAMES =                                                \
-           vld1 vadd vld1_lane vld1_dup vdup vget_high vget_low          \
-           vqdmlal_lane vqdmlsl_lane vext vshrn_n vset_lane vget_lane    \
-           vqsub vqdmulh_lane vqdmull vqdmlal vqdmlsl vceq vcge vcle     \
-           vcgt vclt vbsl vshl vdup_lane vrshrn_n vqdmull_lane           \
-           vst1_lane vqshl vqshl_n vqrshrn_n vsub vqadd vabs vqabs       \
-           vcombine vmax vmin vneg vqneg vmlal vmlal_lane vmlsl          \
-           vmlsl_lane vmovl vmovn vmull vmull_lane vrev vrshl vshl_n     \
-           vshr_n vsra_n vtrn vuzp vzip vreinterpret vqdmulh vqrdmulh    \
-           vqrdmulh_lane vqrshl vaba vabal vabd vabdl vand vorr vorn     \
-           veor vbic vcreate vldX_lane vmla vmls vmul                    \
-           vmul_lane vmul_n vmull_n vqdmulh_n vqdmull_n vqrdmulh_n       \
-           vmla_lane vmls_lane vmla_n vmls_n vmlal_n vmlsl_n vqdmlal_n   \
-           vqdmlsl_n vsri_n vsli_n vtst vaddhn vraddhn vaddl vaddw       \
-           vhadd vrhadd vhsub vsubl vsubw vsubhn vrsubhn vmvn vqmovn     \
-           vqmovun vrshr_n vrsra_n vshll_n vpaddl vpadd vpadal           \
-           vqshlu_n vclz vcls vcnt vqshrn_n vpmax vpmin vqshrun_n        \
-           vqrshrun_n vstX_lane vtbX vrecpe vrsqrte vcage vcagt vcale    \
-           vcalt vrecps vrsqrts vcvt
-
-ARM_NEON_TESTS_REFLIST = $(addprefix ref_, $(ARM_NEON_TESTS_REFNAMES))
-
-ARM_NEON_TESTS_SOURCES = compute_ref.c \
-                         $(addsuffix .c, $(ARM_NEON_TESTS_REFLIST))
-
-ARM_NEON_TESTS_REFGCCARM = stm-arm-neon.gccarm
-ARM_NEON_TESTS_EXPECTED_INPUT = expected_input4gcc.txt
-
-ARM_NEON_TESTS_CFLAGS = -DREFFILE=\"$(ARM_NEON_TESTS_REFGCCARM)\" \
-                        -DGCCTESTS_FILE=\"$(ARM_NEON_TESTS_EXPECTED_INPUT)\"
-
-ARM_NEON_TESTS_CFLAGS += \
-     -Wall \
-     -Werror \
-     -Wno-format \
-     -Wno-ignored-qualifiers \
-     -Wno-uninitialized \
-     -Wno-unused-function \
-     -Wno-unused-variable \
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := arm_neon_tests_arm
-LOCAL_ARM_MODE := arm
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_TARGET_ARCH := arm
-LOCAL_CFLAGS := $(ARM_NEON_TESTS_CFLAGS)
-LOCAL_SRC_FILES := $(ARM_NEON_TESTS_SOURCES)
-LOCAL_CXX_STL := none
-include $(BUILD_NATIVE_TEST)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := arm_neon_tests_thumb
-LOCAL_ARM_MODE := thumb
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_TARGET_ARCH := arm
-LOCAL_CFLAGS := $(ARM_NEON_TESTS_CFLAGS)
-LOCAL_SRC_FILES := $(ARM_NEON_TESTS_SOURCES)
-LOCAL_CXX_STL := none
-include $(BUILD_NATIVE_TEST)
-
-endif