[Bf-blender-cvs] [02495f1e3c9] master: Cycles: Add avxf unit tests.
Ray Molenkamp
noreply at git.blender.org
Sun Feb 9 00:01:33 CET 2020
Commit: 02495f1e3c9dd3b9f70afc03d518742c44dc8a60
Author: Ray Molenkamp
Date: Sat Feb 8 16:01:28 2020 -0700
Branches: master
https://developer.blender.org/rB02495f1e3c9dd3b9f70afc03d518742c44dc8a60
Cycles: Add avxf unit tests.
Differential Revision: https://developer.blender.org/D3706
Reviewers: brecht
===================================================================
M intern/cycles/test/CMakeLists.txt
A intern/cycles/test/util_avxf_avx2_test.cpp
A intern/cycles/test/util_avxf_avx_test.cpp
A intern/cycles/test/util_avxf_test.h
===================================================================
diff --git a/intern/cycles/test/CMakeLists.txt b/intern/cycles/test/CMakeLists.txt
index 98fcc8cd15e..3233e545287 100644
--- a/intern/cycles/test/CMakeLists.txt
+++ b/intern/cycles/test/CMakeLists.txt
@@ -104,3 +104,7 @@ CYCLES_TEST(util_path "cycles_util;${BOOST_LIBRARIES};${OPENIMAGEIO_LIBRARIES}")
CYCLES_TEST(util_string "cycles_util;${BOOST_LIBRARIES};${OPENIMAGEIO_LIBRARIES}")
CYCLES_TEST(util_task "cycles_util;${BOOST_LIBRARIES};${OPENIMAGEIO_LIBRARIES};bf_intern_numaapi")
CYCLES_TEST(util_time "cycles_util;${BOOST_LIBRARIES};${OPENIMAGEIO_LIBRARIES}")
+set_source_files_properties(util_avxf_avx_test.cpp PROPERTIES COMPILE_FLAGS "${CYCLES_AVX_KERNEL_FLAGS}")
+CYCLES_TEST(util_avxf_avx "cycles_util;bf_intern_numaapi;${OPENIMAGEIO_LIBRARIES}")
+set_source_files_properties(util_avxf_avx2_test.cpp PROPERTIES COMPILE_FLAGS "${CYCLES_AVX2_KERNEL_FLAGS}")
+CYCLES_TEST(util_avxf_avx2 "cycles_util;bf_intern_numaapi;${OPENIMAGEIO_LIBRARIES}")
diff --git a/intern/cycles/test/util_avxf_avx2_test.cpp b/intern/cycles/test/util_avxf_avx2_test.cpp
new file mode 100644
index 00000000000..f6917db3230
--- /dev/null
+++ b/intern/cycles/test/util_avxf_avx2_test.cpp
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2011-2016 Blender Foundation
+ *
+ * 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.
+ */
+#define __KERNEL_AVX2__
+#define __KERNEL_CPU__
+
+#if defined(i386) || defined(_M_IX86) || defined(__x86_64__) || defined(_M_X64)
+# include "util_avxf_test.h"
+#endif
+
diff --git a/intern/cycles/test/util_avxf_avx_test.cpp b/intern/cycles/test/util_avxf_avx_test.cpp
new file mode 100644
index 00000000000..87b519085b4
--- /dev/null
+++ b/intern/cycles/test/util_avxf_avx_test.cpp
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2011-2016 Blender Foundation
+ *
+ * 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.
+ */
+#define __KERNEL_AVX__
+#define __KERNEL_CPU__
+
+#if defined(i386) || defined(_M_IX86) || defined(__x86_64__) || defined(_M_X64)
+# include "util_avxf_test.h"
+#endif
\ No newline at end of file
diff --git a/intern/cycles/test/util_avxf_test.h b/intern/cycles/test/util_avxf_test.h
new file mode 100644
index 00000000000..1460f23394a
--- /dev/null
+++ b/intern/cycles/test/util_avxf_test.h
@@ -0,0 +1,224 @@
+/*
+ * Copyright 2011-2016 Blender Foundation
+ *
+ * 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.
+ */
+
+#include "testing/testing.h"
+#include "util/util_types.h"
+#include "util/util_system.h"
+
+CCL_NAMESPACE_BEGIN
+
+bool validate_cpu_capabilities()
+{
+
+#ifdef __KERNEL_AVX2__
+ return system_cpu_support_avx2();
+#else
+# ifdef __KERNEL_AVX__
+ return system_cpu_support_avx();
+# endif
+#endif
+}
+
+#define VALIDATECPU \
+ if (!validate_cpu_capabilities()) \
+ return;
+
+#define compare_vector_scalar(a, b) \
+ for (size_t index = 0; index < a.size; index++) \
+ EXPECT_FLOAT_EQ(a[index], b);
+
+#define compare_vector_vector(a, b) \
+ for (size_t index = 0; index < a.size; index++) \
+ EXPECT_FLOAT_EQ(a[index], b[index]);
+
+#define basic_test_vv(a, b, op) \
+ VALIDATECPU \
+ avxf c = a op b; \
+ for (size_t i = 0; i < a.size; i++) \
+ EXPECT_FLOAT_EQ(c[i], a[i] op b[i]);
+
+/* vector op float tests */
+#define basic_test_vf(a, b, op) \
+ VALIDATECPU \
+ avxf c = a op b; \
+ for (size_t i = 0; i < a.size; i++) \
+ EXPECT_FLOAT_EQ(c[i], a[i] op b);
+
+const avxf avxf_a(0.1f, 0.2f, 0.3f, 0.4f, 0.5f, 0.6f, 0.7f, 0.8f);
+const avxf avxf_b(1.0f, 2.0f, 3.0f, 4.0f, 5.0f, 6.0f, 7.0f, 8.0f);
+const avxf avxf_c(1.1f, 2.2f, 3.3f, 4.4f, 5.5f, 6.6f, 7.7f, 8.8f);
+const float float_b = 1.5f;
+
+TEST(util_avx, avxf_add_vv){basic_test_vv(avxf_a, avxf_b, +)}
+TEST(util_avx, avxf_sub_vv){basic_test_vv(avxf_a, avxf_b, -)}
+TEST(util_avx, avxf_mul_vv){basic_test_vv(avxf_a, avxf_b, *)}
+TEST(util_avx, avxf_div_vv){basic_test_vv(avxf_a, avxf_b, /)}
+TEST(util_avx, avxf_add_vf){basic_test_vf(avxf_a, float_b, +)}
+TEST(util_avx, avxf_sub_vf){basic_test_vf(avxf_a, float_b, -)}
+TEST(util_avx, avxf_mul_vf){basic_test_vf(avxf_a, float_b, *)}
+TEST(util_avx, avxf_div_vf){basic_test_vf(avxf_a, float_b, /)}
+
+TEST(util_avx, avxf_ctor)
+{
+ VALIDATECPU
+ compare_vector_scalar(avxf(7.0f, 6.0f, 5.0f, 4.0f, 3.0f, 2.0f, 1.0f, 0.0f),
+ static_cast<float>(index));
+ compare_vector_scalar(avxf(1.0f), 1.0f);
+ compare_vector_vector(avxf(1.0f, 2.0f),
+ avxf(1.0f, 1.0f, 1.0f, 1.0f, 2.0f, 2.0f, 2.0f, 2.0f));
+ compare_vector_vector(avxf(1.0f, 2.0f, 3.0f, 4.0f),
+ avxf(1.0f, 2.0f, 3.0f, 4.0f, 1.0f, 2.0f, 3.0f, 4.0f));
+ compare_vector_vector(avxf(make_float3(1.0f, 2.0f, 3.0f)),
+ avxf(0.0f, 3.0f, 2.0f, 1.0f, 0.0f, 3.0f, 2.0f, 1.0f));
+}
+
+TEST(util_avx, avxf_sqrt)
+{
+ VALIDATECPU
+ compare_vector_vector(
+ mm256_sqrt(
+ avxf(1.0f, 4.0f, 9.0f, 16.0f, 25.0f, 36.0f, 49.0f, 64.0f)),
+ avxf(1.0f, 2.0f, 3.0f, 4.0f, 5.0f, 6.0f, 7.0f, 8.0f));
+}
+
+TEST(util_avx, avxf_min_max)
+{
+ VALIDATECPU
+ compare_vector_vector(min(avxf_a, avxf_b), avxf_a);
+ compare_vector_vector(max(avxf_a, avxf_b), avxf_b);
+}
+
+TEST(util_avx, avxf_set_sign)
+{
+ VALIDATECPU
+ avxf res = set_sign_bit<1, 0, 0, 0, 0, 0, 0, 0>(avxf_a);
+ compare_vector_vector(
+ res, avxf(0.1f, 0.2f, 0.3f, 0.4f, 0.5f, 0.6f, 0.7f, -0.8f));
+}
+
+TEST(util_avx, avxf_msub)
+{
+ VALIDATECPU
+ avxf res = msub(avxf_a, avxf_b, avxf_c);
+ avxf exp = avxf((avxf_a[7] * avxf_b[7]) - avxf_c[7],
+ (avxf_a[6] * avxf_b[6]) - avxf_c[6],
+ (avxf_a[5] * avxf_b[5]) - avxf_c[5],
+ (avxf_a[4] * avxf_b[4]) - avxf_c[4],
+ (avxf_a[3] * avxf_b[3]) - avxf_c[3],
+ (avxf_a[2] * avxf_b[2]) - avxf_c[2],
+ (avxf_a[1] * avxf_b[1]) - avxf_c[1],
+ (avxf_a[0] * avxf_b[0]) - avxf_c[0]);
+ compare_vector_vector(res, exp);
+}
+
+TEST(util_avx, avxf_madd)
+{
+ VALIDATECPU
+ avxf res = madd(avxf_a, avxf_b, avxf_c);
+ avxf exp = avxf((avxf_a[7] * avxf_b[7]) + avxf_c[7],
+ (avxf_a[6] * avxf_b[6]) + avxf_c[6],
+ (avxf_a[5] * avxf_b[5]) + avxf_c[5],
+ (avxf_a[4] * avxf_b[4]) + avxf_c[4],
+ (avxf_a[3] * avxf_b[3]) + avxf_c[3],
+ (avxf_a[2] * avxf_b[2]) + avxf_c[2],
+ (avxf_a[1] * avxf_b[1]) + avxf_c[1],
+ (avxf_a[0] * avxf_b[0]) + avxf_c[0]);
+ compare_vector_vector(res, exp);
+}
+
+TEST(util_avx, avxf_nmadd)
+{
+ VALIDATECPU
+ avxf res = nmadd(avxf_a, avxf_b, avxf_c);
+ avxf exp = avxf(avxf_c[7] - (avxf_a[7] * avxf_b[7]),
+ avxf_c[6] - (avxf_a[6] * avxf_b[6]),
+ avxf_c[5] - (avxf_a[5] * avxf_b[5]),
+ avxf_c[4] - (avxf_a[4] * avxf_b[4]),
+ avxf_c[3] - (avxf_a[3] * avxf_b[3]),
+ avxf_c[2] - (avxf_a[2] * avxf_b[2]),
+ avxf_c[1] - (avxf_a[1] * avxf_b[1]),
+ avxf_c[0] - (avxf_a[0] * avxf_b[0]));
+ compare_vector_vector(res, exp);
+}
+
+TEST(util_avx, avxf_compare)
+{
+ VALIDATECPU
+ avxf a(0.0f, 1.0f, 2.0f, 3.0f, 4.0f, 5.0f, 6.0f, 7.0f);
+ avxf b(7.0f, 6.0f, 5.0f, 4.0f, 3.0f, 2.0f, 1.0f, 0.0f);
+ avxb res = a <= b;
+ int exp[8] = {
+ a[0] <= b[0] ? -1 : 0,
+ a[1] <= b[1] ? -1 : 0,
+ a[2] <= b[2] ? -1 : 0,
+ a[3] <= b[3] ? -1 : 0,
+ a[4] <= b[4] ? -1 : 0,
+ a[5] <= b[5] ? -1 : 0,
+ a[6] <= b[6] ? -1 : 0,
+ a[7] <= b[7] ? -1 : 0,
+ };
+ compare_vector_vector(res, exp);
+}
+
+TEST(util_avx, avxf_permute)
+{
+ VALIDATECPU
+ avxf res = permute<3, 0, 1, 7, 6, 5, 2, 4>(avxf_b);
+ compare_vector_vector(res,
+ avxf(4.0f, 6.0f, 3.0f, 2.0f, 1.0f, 7.0f, 8.0f, 5.0f));
+}
+
+TEST(util_avx, avxf_blend)
+{
+ VALIDATECPU
+ avxf res = blend<0, 0, 1, 0, 1, 0, 1, 0>(avxf_a, avxf_b);
+ compare_vector_vector(res,
+ avxf(0.1f, 0.2f, 3.0f, 0.4f, 5.0f, 0.6f, 7.0f, 0.8f));
+}
+
+TEST(util_avx, avxf_shuffle)
+{
+ VALIDATECPU
+ avxf res = shuffle<0, 1, 2,
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list