Add valgrind-3.14.0-add-vector-h.patch.
This commit is contained in:
Mark Wielaard
parent
c14588c528
commit
364b6d8173
179
valgrind-3.14.0-add-vector-h.patch
Normal file
179
valgrind-3.14.0-add-vector-h.patch
Normal file
@ -0,0 +1,179 @@
|
|||||||
|
diff --git a/none/tests/s390x/vector.h b/none/tests/s390x/vector.h
|
||||||
|
new file mode 100644
|
||||||
|
index 000000000..a6538b43f
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/none/tests/s390x/vector.h
|
||||||
|
@@ -0,0 +1,173 @@
|
||||||
|
+#ifndef S390_TEST_VECTOR_H
|
||||||
|
+#define S390_TEST_VECTOR_H
|
||||||
|
+
|
||||||
|
+#include "stdbool.h"
|
||||||
|
+#include "stdint.h"
|
||||||
|
+#include "stdio.h"
|
||||||
|
+#include "string.h"
|
||||||
|
+
|
||||||
|
+/* How many times should every test be executed? */
|
||||||
|
+#define S390_TEST_COUNT 10
|
||||||
|
+
|
||||||
|
+/* Test the instruction exactly one time. */
|
||||||
|
+#define test_once(insn) test_##insn()
|
||||||
|
+
|
||||||
|
+/* Test the instruction exactly S390_TEST_COUNT times.
|
||||||
|
+ "..." arguments specifies code which must be executed after each tests
|
||||||
|
+ */
|
||||||
|
+#define test(insn, ...) \
|
||||||
|
+ for(iteration = 0; iteration < S390_TEST_COUNT; iteration++) \
|
||||||
|
+ { test_##insn(); \
|
||||||
|
+ __VA_ARGS__; \
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+#ifdef __GNUC__
|
||||||
|
+/* GCC complains about __int128 with -pedantic */
|
||||||
|
+/* Hope that we will have int128_t in C standard someday. */
|
||||||
|
+#pragma GCC diagnostic ignored "-Wpedantic"
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
+typedef union {
|
||||||
|
+ uint8_t u8[16];
|
||||||
|
+ int8_t s8[16];
|
||||||
|
+
|
||||||
|
+ uint16_t u16[8];
|
||||||
|
+ int16_t s16[8];
|
||||||
|
+
|
||||||
|
+ uint32_t u32[4];
|
||||||
|
+ int32_t s32[4];
|
||||||
|
+
|
||||||
|
+ uint64_t u64[2];
|
||||||
|
+ int64_t s64[2];
|
||||||
|
+
|
||||||
|
+ unsigned __int128 u128[1];
|
||||||
|
+ __int128 s128[1];
|
||||||
|
+} V128;
|
||||||
|
+
|
||||||
|
+void print_hex(const V128 value) {
|
||||||
|
+ printf("%016lx | %016lx\n", value.u64[0], value.u64[1]);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+void print_uint64_t(const uint64_t value) {
|
||||||
|
+ printf("%016lx\n", value);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+uint8_t random_element ( void )
|
||||||
|
+{
|
||||||
|
+ static uint32_t seed = 80021;
|
||||||
|
+ seed = 1103515245 * seed + 12345;
|
||||||
|
+ return (seed >> 17) & 0xFF;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+void random_V128 (V128 *block)
|
||||||
|
+{
|
||||||
|
+ size_t i;
|
||||||
|
+ for(i = 0; i < 16; i++)
|
||||||
|
+ {
|
||||||
|
+ block->u8[i] = random_element();
|
||||||
|
+ }
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+uint64_t random_uint64_t()
|
||||||
|
+{
|
||||||
|
+ uint64_t result = 0ULL;
|
||||||
|
+ uint8_t *ptr = (uint8_t *) &result;
|
||||||
|
+ size_t i;
|
||||||
|
+ for(i = 0; i < 8; i++)
|
||||||
|
+ {
|
||||||
|
+ ptr[i] = random_element();
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ return result;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+/* Memory pool with some random data. Used for some instruction which need
|
||||||
|
+ an address to some memory chunk.
|
||||||
|
+ Pool should be large enough for all insn that use it.
|
||||||
|
+ (64 bytes and aligning are needed by VLBB insn)
|
||||||
|
+
|
||||||
|
+ Content of this pool must be updated every iteration but not from test to test.
|
||||||
|
+*/
|
||||||
|
+uint8_t random_memory_pool[64] __attribute__ ((aligned (64)));
|
||||||
|
+void randomize_memory_pool()
|
||||||
|
+{
|
||||||
|
+ size_t i;
|
||||||
|
+ for(i = 0; i < sizeof(random_memory_pool) / sizeof(random_memory_pool[0]); i++)
|
||||||
|
+ {
|
||||||
|
+ random_memory_pool[i] = random_element();
|
||||||
|
+ }
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+/* Define a test for input. Takes up theese arguments:
|
||||||
|
+ insn -- instruction name
|
||||||
|
+ asm_string -- line (or multiple lines) with asm mnemonics for instruction
|
||||||
|
+
|
||||||
|
+ The folowing registers layout expected:
|
||||||
|
+ ("r" for register form and m for memory form)
|
||||||
|
+ v1 -- vector arg1
|
||||||
|
+ v2 -- vector arg2
|
||||||
|
+ v3 -- vector arg3
|
||||||
|
+ v5 -- vector result
|
||||||
|
+ [{r,m}_arg1] -- integer arg1
|
||||||
|
+ [{r,m}_arg2] -- integer arg2
|
||||||
|
+ [{r,m}_arg3] -- integer arg3
|
||||||
|
+ [{r,m}_result] -- integer result
|
||||||
|
+ [{r,m}_memory_pool] -- address of random memory pool. Usefull for some instructions
|
||||||
|
+
|
||||||
|
+*/
|
||||||
|
+#define s390_test_generate(insn, asm_string) \
|
||||||
|
+static void test_##insn() \
|
||||||
|
+{ \
|
||||||
|
+ V128 v_result = { .u64 = {0ULL, 0ULL} }; \
|
||||||
|
+ V128 v_arg1; \
|
||||||
|
+ V128 v_arg2; \
|
||||||
|
+ V128 v_arg3; \
|
||||||
|
+ uint64_t r_arg1 = random_uint64_t(); \
|
||||||
|
+ uint64_t r_arg2 = random_uint64_t(); \
|
||||||
|
+ uint64_t r_arg3 = random_uint64_t(); \
|
||||||
|
+ uint64_t r_result = 0ULL; \
|
||||||
|
+ \
|
||||||
|
+ random_V128(&v_arg1); \
|
||||||
|
+ random_V128(&v_arg2); \
|
||||||
|
+ random_V128(&v_arg3); \
|
||||||
|
+ \
|
||||||
|
+ __asm__ volatile( \
|
||||||
|
+ "vl %%v1, %[v_arg1]\n" \
|
||||||
|
+ "vl %%v2, %[v_arg2]\n" \
|
||||||
|
+ "vl %%v3, %[v_arg3]\n" \
|
||||||
|
+ "vone %%v5\n" \
|
||||||
|
+ asm_string "\n"\
|
||||||
|
+ "vst %%v5, %[v_result]\n" \
|
||||||
|
+ "vst %%v1, %[v_arg1]\n" \
|
||||||
|
+ "vst %%v2, %[v_arg2]\n" \
|
||||||
|
+ "vst %%v3, %[v_arg3]\n" \
|
||||||
|
+ : [v_result] "=m" (v_result), \
|
||||||
|
+ [m_result] "=m" (r_result), \
|
||||||
|
+ [r_result] "+d" (r_result), \
|
||||||
|
+ [r_arg1] "+d" (r_arg1), \
|
||||||
|
+ [r_arg2] "+d" (r_arg2), \
|
||||||
|
+ [r_arg3] "+d" (r_arg3) \
|
||||||
|
+ : [v_arg1] "m" (v_arg1), \
|
||||||
|
+ [v_arg2] "m" (v_arg2), \
|
||||||
|
+ [v_arg3] "m" (v_arg3), \
|
||||||
|
+ [m_arg1] "m" (r_arg1), \
|
||||||
|
+ [m_arg2] "m" (r_arg2), \
|
||||||
|
+ [m_arg3] "m" (r_arg3), \
|
||||||
|
+ [r_memory_pool] "r" (random_memory_pool), \
|
||||||
|
+ [m_memory_pool] "m" (random_memory_pool) \
|
||||||
|
+ : "memory", "cc", \
|
||||||
|
+ "r1", "r2", "r3", "r5", \
|
||||||
|
+ "v1", "v2", "v3", "v5"); \
|
||||||
|
+ \
|
||||||
|
+ printf("insn %s:\n", #insn); \
|
||||||
|
+ printf(" v_arg1 = "); print_hex(v_arg1); \
|
||||||
|
+ printf(" v_arg2 = "); print_hex(v_arg2); \
|
||||||
|
+ printf(" v_arg3 = "); print_hex(v_arg3); \
|
||||||
|
+ printf(" v_result = "); print_hex(v_result); \
|
||||||
|
+ printf(" r_arg1 = "); print_uint64_t(r_arg1); \
|
||||||
|
+ printf(" r_arg2 = "); print_uint64_t(r_arg2); \
|
||||||
|
+ printf(" r_arg3 = "); print_uint64_t(r_arg3); \
|
||||||
|
+ printf(" r_result = "); print_uint64_t(r_result); \
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+#endif
|
||||||
@ -113,6 +113,10 @@ Patch2: valgrind-3.9.0-helgrind-race-supp.patch
|
|||||||
# Make ld.so supressions slightly less specific.
|
# Make ld.so supressions slightly less specific.
|
||||||
Patch3: valgrind-3.9.0-ldso-supp.patch
|
Patch3: valgrind-3.9.0-ldso-supp.patch
|
||||||
|
|
||||||
|
# Missing file for s390x testsuite.
|
||||||
|
# Upstream commit 4f5e6168e75a1915a6a27e7068aef04d670aeb7e
|
||||||
|
Patch4: valgrind-3.14.0-add-vector-h.patch
|
||||||
|
|
||||||
%if %{build_multilib}
|
%if %{build_multilib}
|
||||||
# Ensure glibc{,-devel} is installed for both multilib arches
|
# Ensure glibc{,-devel} is installed for both multilib arches
|
||||||
BuildRequires: /lib/libc.so.6 /usr/lib/libc.so /lib64/libc.so.6 /usr/lib64/libc.so
|
BuildRequires: /lib/libc.so.6 /usr/lib/libc.so /lib64/libc.so.6 /usr/lib64/libc.so
|
||||||
@ -248,6 +252,7 @@ Valgrind User Manual for details.
|
|||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
%patch2 -p1
|
%patch2 -p1
|
||||||
%patch3 -p1
|
%patch3 -p1
|
||||||
|
%patch4 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
CC=gcc
|
CC=gcc
|
||||||
@ -484,6 +489,7 @@ fi
|
|||||||
%changelog
|
%changelog
|
||||||
* Fri Sep 14 2018 Mark Wielaard <mjw@fedoraproject.org> - 3.14.0-0.1.GIT
|
* Fri Sep 14 2018 Mark Wielaard <mjw@fedoraproject.org> - 3.14.0-0.1.GIT
|
||||||
- New upstream (pre-)release.
|
- New upstream (pre-)release.
|
||||||
|
- Add valgrind-3.14.0-add-vector-h.patch.
|
||||||
|
|
||||||
* Fri Aug 10 2018 Mark Wielaard <mjw@fedoraproject.org> - 3.13.0-28
|
* Fri Aug 10 2018 Mark Wielaard <mjw@fedoraproject.org> - 3.13.0-28
|
||||||
- Add valgrind-3.13.0-utime.patch
|
- Add valgrind-3.13.0-utime.patch
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user