diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:28:33 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:31:28 +0300 |
commit | 193236933b0f4ab91b1625b64e2187e2db4e0e8f (patch) | |
tree | e12769d7c76d8b0517d6de3d3c72189753d253ed /meta-openembedded/meta-oe/recipes-benchmark/cpuburn/cpuburn-arm | |
parent | bd93df9478f2f56ffcbc8cb88f1709c735dcd85b (diff) | |
download | openbmc-193236933b0f4ab91b1625b64e2187e2db4e0e8f.tar.xz |
reset upstream subtrees to HEAD
Reset the following subtrees on HEAD:
poky: 8217b477a1(master)
meta-xilinx: 64aa3d35ae(master)
meta-openembedded: 0435c9e193(master)
meta-raspberrypi: 490a4441ac(master)
meta-security: cb6d1c85ee(master)
Squashed patches:
meta-phosphor: drop systemd 239 patches
meta-phosphor: mrw-api: use correct install path
Change-Id: I268e2646d9174ad305630c6bbd3fbc1a6105f43d
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-benchmark/cpuburn/cpuburn-arm')
3 files changed, 147 insertions, 0 deletions
diff --git a/meta-openembedded/meta-oe/recipes-benchmark/cpuburn/cpuburn-arm/0001-cpuburn-a8.S-Remove-.func-.endfunc.patch b/meta-openembedded/meta-oe/recipes-benchmark/cpuburn/cpuburn-arm/0001-cpuburn-a8.S-Remove-.func-.endfunc.patch new file mode 100644 index 000000000..82f12fe81 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-benchmark/cpuburn/cpuburn-arm/0001-cpuburn-a8.S-Remove-.func-.endfunc.patch @@ -0,0 +1,69 @@ +From 064a63860bf9ee4bf54facb76ca66f9f957d4797 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 29 Jan 2019 11:12:38 -0800 +Subject: [PATCH] cpuburn*.S: Remove .func/.endfunc + +These are needed to generate stabs debug info which we dont use +and are silently ignored by gnu assembler when unused, clang assembler +however barfs, so remove them + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +--- + cpuburn-a7.S | 2 -- + cpuburn-a8.S | 2 -- + cpuburn-a9.S | 2 -- + 3 files changed, 6 deletions(-) + +diff --git a/cpuburn-a7.S b/cpuburn-a7.S +index 74e925a..c1e308c 100644 +--- a/cpuburn-a7.S ++++ b/cpuburn-a7.S +@@ -42,7 +42,6 @@ + + .global main + +-.func main + .type main, %function + main: + push {r4-r12, lr} +@@ -88,4 +87,3 @@ main: + + mov r0, #0 + pop {r4-r12, pc} +-.endfunc +diff --git a/cpuburn-a8.S b/cpuburn-a8.S +index c6f93a6..a42f5a5 100644 +--- a/cpuburn-a8.S ++++ b/cpuburn-a8.S +@@ -46,7 +46,6 @@ + /* 16 seems to be a good choice */ + #define STEP 16 + +-.func main + .thumb_func + main: + mov lr, pc +@@ -70,4 +69,3 @@ main: + subs lr, lr, #(STEP * 4) + .endr + bne 0b +-.endfunc +diff --git a/cpuburn-a9.S b/cpuburn-a9.S +index 0338b00..a1ccae5 100644 +--- a/cpuburn-a9.S ++++ b/cpuburn-a9.S +@@ -48,7 +48,6 @@ + /* 64 seems to be a good choice */ + #define STEP 64 + +-.func main + .type main, %function + main: + +@@ -94,4 +93,3 @@ main: + subsne lr, lr, #(STEP * 4) + .endr + bne 0b +-.endfunc diff --git a/meta-openembedded/meta-oe/recipes-benchmark/cpuburn/cpuburn-arm/0002-burn.S-Add.patch b/meta-openembedded/meta-oe/recipes-benchmark/cpuburn/cpuburn-arm/0002-burn.S-Add.patch new file mode 100644 index 000000000..eb68c9ce9 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-benchmark/cpuburn/cpuburn-arm/0002-burn.S-Add.patch @@ -0,0 +1,47 @@ +From c2adcca93a0075665a8195caad49b89785886e8e Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 29 Jan 2019 12:02:22 -0800 +Subject: [PATCH] burn.S: Add + +This is originally from +https://hardwarebug.org/files/burn.S + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + burn.S | 26 ++++++++++++++++++++++++++ + 1 file changed, 26 insertions(+) + create mode 100644 burn.S + +diff --git a/burn.S b/burn.S +new file mode 100644 +index 0000000..c372c87 +--- /dev/null ++++ b/burn.S +@@ -0,0 +1,26 @@ ++ .arch armv7-a ++ .fpu neon ++ ++ .text ++ ++ .global main ++ .type main, STT_FUNC ++ .func main ++main: ++ bic sp, sp, #15 ++1: ++ vld1.8 {q8}, [sp,:128] ++ smuad r6, r4, r5 ++ veor q9, q0, q1 ++ add lr, r4, r5 ++ ldr ip, [sp] ++ vext.8 q10, q3, q4, #1 ++ eor r5, r4, r5 ++ vadd.i32 q11, q0, q1 ++ smusd r6, r4, r5 ++ ldr r2, [sp] ++ vext.8 q12, q1, q2, #3 ++ ssub8 lr, r4, r5 ++ vmul.u16 q13, q0, q4 ++ b 1b ++.endfunc diff --git a/meta-openembedded/meta-oe/recipes-benchmark/cpuburn/cpuburn-arm/0003-burn.S-Remove-.func-.endfunc.patch b/meta-openembedded/meta-oe/recipes-benchmark/cpuburn/cpuburn-arm/0003-burn.S-Remove-.func-.endfunc.patch new file mode 100644 index 000000000..f351b62c7 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-benchmark/cpuburn/cpuburn-arm/0003-burn.S-Remove-.func-.endfunc.patch @@ -0,0 +1,31 @@ +From 078df5b25d75578bb0448ca53514c23debe6d920 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 29 Jan 2019 12:03:11 -0800 +Subject: [PATCH] burn.S: Remove .func/.endfunc + +These are useless on Linux systems where we use dwarf debug info instead +of stabs + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + burn.S | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/burn.S b/burn.S +index c372c87..4458f51 100644 +--- a/burn.S ++++ b/burn.S +@@ -5,7 +5,6 @@ + + .global main + .type main, STT_FUNC +- .func main + main: + bic sp, sp, #15 + 1: +@@ -23,4 +22,3 @@ main: + ssub8 lr, r4, r5 + vmul.u16 q13, q0, q4 + b 1b +-.endfunc |