Snap for 8562061 from 6dea06094f0afa4f69e20f55160bae1496c04ac8 to mainline-media-release
Change-Id: I3dad24a3bd6c116503250fb4f2abac34ee80761a
diff --git a/Android.bp b/Android.bp
index f48dae0..37913dd 100644
--- a/Android.bp
+++ b/Android.bp
@@ -374,6 +374,17 @@
cc_test {
+ name: "ocl-test-spir",
+ srcs: [ "test_conformance/spir/*.cpp", "test_conformance/math_brute_force/function_list.cpp", "test_common/miniz/miniz.c" ],
+ data: [ "test_conformance/spir/*.zip" ],
+ cflags: [ "-DFUNCTION_LIST_ULPS_ONLY", "-Wno-unused-private-field" ],
+ defaults: [ "ocl-test-defaults" ],
+ rtti: true,
+ gtest: false
+}
+
+
+cc_test {
name: "ocl-test-spirv-new",
srcs: [ "test_conformance/spirv_new/*.cpp", "test_conformance/math_brute_force/reference_math.cpp", "test_conformance/math_brute_force/utility.cpp" ],
data: [ "test_conformance/spirv_new/spirv_asm/*", "test_conformance/spirv_new/spirv_bin/*" ],
@@ -499,3 +510,19 @@
unit_test: false,
},
}
+
+python_test {
+ name: "run_conformance",
+ main: "test_conformance/run_conformance.py",
+ srcs: [ "test_conformance/run_conformance.py" ],
+ version: {
+ py2: {
+ enabled: true,
+ embedded_launcher: true,
+ },
+ py3: {
+ enabled: false,
+ }
+ },
+}
+
diff --git a/METADATA b/METADATA
index 5c12860..1eaf99d 100644
--- a/METADATA
+++ b/METADATA
@@ -1,3 +1,7 @@
+# *** THIS PACKAGE HAS SPECIAL LICENSING CONDITIONS. PLEASE
+# CONSULT THE OWNERS AND opensource-licensing@google.com BEFORE
+# DEPENDING ON IT IN YOUR PROJECT. ***
third_party {
+ license_note: "Khronos proprietary"
license_type: BY_EXCEPTION_ONLY
}
diff --git a/scripts/android_bp_tail b/scripts/android_bp_tail
index c295fc1..a073f33 100644
--- a/scripts/android_bp_tail
+++ b/scripts/android_bp_tail
@@ -16,3 +16,19 @@
unit_test: false,
},
}
+
+python_test {
+ name: "run_conformance",
+ main: "test_conformance/run_conformance.py",
+ srcs: [ "test_conformance/run_conformance.py" ],
+ version: {
+ py2: {
+ enabled: true,
+ embedded_launcher: true,
+ },
+ py3: {
+ enabled: false,
+ }
+ },
+}
+
diff --git a/scripts/generate_test_files.py b/scripts/generate_test_files.py
index 3d916f6..cdb10db 100644
--- a/scripts/generate_test_files.py
+++ b/scripts/generate_test_files.py
@@ -11,10 +11,6 @@
def write_one_cc_test(test_details, f):
- # TODO(b/161524664): Remove this exception for spir
- if test_details['test_name'] == 'spir':
- return
-
stringified_sources = map(lambda s: f'"{s}"', test_details['srcs'])
stringified_data = map(lambda s: f'"{s}"', test_details.get('data', []))
stringified_cflags = map(lambda s: f'"{s}"', test_details.get('cflags', []))
diff --git a/scripts/tests.json b/scripts/tests.json
index 769c1d7..59a24de 100644
--- a/scripts/tests.json
+++ b/scripts/tests.json
@@ -212,7 +212,7 @@
"binary_name": "ocl-test-spir",
"srcs": [
"test_conformance/spir/*.cpp",
- "test_conformance/math_brute_force/FunctionList.cpp",
+ "test_conformance/math_brute_force/function_list.cpp",
"test_common/miniz/miniz.c"
],
"data": [ "test_conformance/spir/*.zip" ],
