From 4e530464b00db308480ce9036b78bb125bb86477 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Sat, 15 Jan 2022 19:45:46 +0100 Subject: bsps: Default to CPU counter benchmark timer Most BSPs which used the stubbed benachmark timer provide a CPU counter. All BSPs provide at least a stub CPU counter. Simply use the benchmark timer implementation using the CPU counter. --- bsps/shared/dev/btimer/btimer-stub.c | 30 ---------------------- .../arm/altera-cyclone-v/bspalteracyclonev.yml | 2 +- spec/build/bsps/arm/atsam/bspatsam.yml | 2 +- spec/build/bsps/arm/beagle/obj.yml | 2 +- spec/build/bsps/arm/imx/bspimx.yml | 2 +- spec/build/bsps/arm/imxrt/bspimxrt.yml | 2 +- spec/build/bsps/arm/lm3s69xx/obj.yml | 2 +- .../bsps/arm/realview-pbx-a9/bsprealviewpbxa9.yml | 2 +- spec/build/bsps/arm/stm32f4/obj.yml | 2 +- spec/build/bsps/arm/stm32h7/obj.yml | 2 +- spec/build/bsps/arm/xen/bspxen.yml | 2 +- spec/build/bsps/arm/xilinx-zynq/obj.yml | 2 +- .../bsps/arm/xilinx-zynqmp/bspxilinxzynqmp.yml | 2 +- spec/build/bsps/mips/malta/bspmalta.yml | 2 +- spec/build/bsps/moxie/moxiesim/bspmoxiesim.yml | 2 +- spec/build/bsps/powerpc/t32mppc/bspt32mppc.yml | 2 +- spec/build/bsps/riscv/griscv/obj.yml | 2 +- spec/build/bsps/sh/shsim/obj.yml | 2 +- spec/build/bsps/sparc64/niagara/bspniagara.yml | 2 +- spec/build/bsps/sparc64/usiii/bspusiii.yml | 2 +- spec/build/bsps/v850/gdbv850sim/obj.yml | 2 +- spec/build/bsps/x86_64/amd64/bspamd64.yml | 2 +- 22 files changed, 21 insertions(+), 51 deletions(-) delete mode 100644 bsps/shared/dev/btimer/btimer-stub.c diff --git a/bsps/shared/dev/btimer/btimer-stub.c b/bsps/shared/dev/btimer/btimer-stub.c deleted file mode 100644 index d1e3313115..0000000000 --- a/bsps/shared/dev/btimer/btimer-stub.c +++ /dev/null @@ -1,30 +0,0 @@ -/* - * This file implements a stub benchmark timer that is sufficient to - * satisfy linking the RTEMS Benchmarks. - * - * COPYRIGHT (c) 1989-2001. - * On-Line Applications Research Corporation (OAR). - */ - -#include -#include - -bool benchmark_timer_find_average_overhead; - -void benchmark_timer_initialize(void) -{ -} - -benchmark_timer_t benchmark_timer_read(void) -{ - if (benchmark_timer_find_average_overhead) - return 1; - return 0; -} - -void benchmark_timer_disable_subtracting_average_overhead( - bool find_flag -) -{ - benchmark_timer_find_average_overhead = find_flag; -} diff --git a/spec/build/bsps/arm/altera-cyclone-v/bspalteracyclonev.yml b/spec/build/bsps/arm/altera-cyclone-v/bspalteracyclonev.yml index 30dbade196..f1f39ff6b2 100644 --- a/spec/build/bsps/arm/altera-cyclone-v/bspalteracyclonev.yml +++ b/spec/build/bsps/arm/altera-cyclone-v/bspalteracyclonev.yml @@ -129,7 +129,7 @@ source: - bsps/arm/shared/cp15/arm-cp15-set-exception-handler.c - bsps/arm/shared/cp15/arm-cp15-set-ttb-entries.c - bsps/arm/shared/start/bsp-start-memcpy.S -- bsps/shared/dev/btimer/btimer-stub.c +- bsps/shared/dev/btimer/btimer-cpucounter.c - bsps/shared/dev/getentropy/getentropy-cpucounter.c - bsps/shared/dev/irq/arm-gicv2.c - bsps/shared/dev/irq/arm-gicv2-get-attributes.c diff --git a/spec/build/bsps/arm/atsam/bspatsam.yml b/spec/build/bsps/arm/atsam/bspatsam.yml index c60646f8d7..7cb053cc24 100644 --- a/spec/build/bsps/arm/atsam/bspatsam.yml +++ b/spec/build/bsps/arm/atsam/bspatsam.yml @@ -400,7 +400,7 @@ source: - bsps/arm/shared/irq/irq-dispatch-armv7m.c - bsps/arm/shared/start/bsp-start-memcpy.S - bsps/arm/shared/start/bspreset-armv7m.c -- bsps/shared/dev/btimer/btimer-stub.c +- bsps/shared/dev/btimer/btimer-cpucounter.c - bsps/shared/dev/rtc/rtc-support.c - bsps/shared/dev/serial/console-termios.c - bsps/shared/irq/irq-default-handler.c diff --git a/spec/build/bsps/arm/beagle/obj.yml b/spec/build/bsps/arm/beagle/obj.yml index 36ef28d6f4..396ab70baf 100644 --- a/spec/build/bsps/arm/beagle/obj.yml +++ b/spec/build/bsps/arm/beagle/obj.yml @@ -47,7 +47,7 @@ source: - bsps/arm/shared/cp15/arm-cp15-set-exception-handler.c - bsps/arm/shared/cp15/arm-cp15-set-ttb-entries.c - bsps/arm/shared/start/bsp-start-memcpy.S -- bsps/shared/dev/btimer/btimer-stub.c +- bsps/shared/dev/btimer/btimer-cpucounter.c - bsps/shared/dev/cpucounter/cpucounterfrequency.c - bsps/shared/dev/cpucounter/cpucounterread.c - bsps/shared/dev/getentropy/getentropy-cpucounter.c diff --git a/spec/build/bsps/arm/imx/bspimx.yml b/spec/build/bsps/arm/imx/bspimx.yml index 4da67842d2..24e56a499f 100644 --- a/spec/build/bsps/arm/imx/bspimx.yml +++ b/spec/build/bsps/arm/imx/bspimx.yml @@ -98,7 +98,7 @@ source: - bsps/arm/shared/pins/imx-gpio.c - bsps/arm/shared/pins/imx_iomux.c - bsps/arm/shared/start/bsp-start-memcpy.S -- bsps/shared/dev/btimer/btimer-stub.c +- bsps/shared/dev/btimer/btimer-cpucounter.c - bsps/shared/dev/clock/arm-generic-timer.c - bsps/shared/dev/getentropy/getentropy-cpucounter.c - bsps/shared/dev/irq/arm-gicv2.c diff --git a/spec/build/bsps/arm/imxrt/bspimxrt.yml b/spec/build/bsps/arm/imxrt/bspimxrt.yml index 8f78369d3c..f4142d844c 100644 --- a/spec/build/bsps/arm/imxrt/bspimxrt.yml +++ b/spec/build/bsps/arm/imxrt/bspimxrt.yml @@ -258,7 +258,7 @@ source: - bsps/arm/shared/pins/imx_iomux.c - bsps/arm/shared/start/bsp-start-memcpy.S - bsps/arm/shared/start/bspreset-armv7m.c -- bsps/shared/dev/btimer/btimer-stub.c +- bsps/shared/dev/btimer/btimer-cpucounter.c - bsps/shared/dev/getentropy/getentropy-cpucounter.c - bsps/shared/dev/serial/console-termios.c - bsps/shared/irq/irq-default-handler.c diff --git a/spec/build/bsps/arm/lm3s69xx/obj.yml b/spec/build/bsps/arm/lm3s69xx/obj.yml index 79ecd0fcda..74071008e2 100644 --- a/spec/build/bsps/arm/lm3s69xx/obj.yml +++ b/spec/build/bsps/arm/lm3s69xx/obj.yml @@ -40,7 +40,7 @@ source: - bsps/arm/shared/start/bsp-start-memcpy.S - bsps/arm/shared/start/bspreset-armv7m.c - bsps/shared/cache/nocache.c -- bsps/shared/dev/btimer/btimer-stub.c +- bsps/shared/dev/btimer/btimer-cpucounter.c - bsps/shared/dev/cpucounter/cpucounterfrequency.c - bsps/shared/dev/cpucounter/cpucounterread.c - bsps/shared/dev/getentropy/getentropy-cpucounter.c diff --git a/spec/build/bsps/arm/realview-pbx-a9/bsprealviewpbxa9.yml b/spec/build/bsps/arm/realview-pbx-a9/bsprealviewpbxa9.yml index 46f0236bf9..4dae66a825 100644 --- a/spec/build/bsps/arm/realview-pbx-a9/bsprealviewpbxa9.yml +++ b/spec/build/bsps/arm/realview-pbx-a9/bsprealviewpbxa9.yml @@ -71,7 +71,7 @@ source: - bsps/arm/shared/fb/arm-pl111.c - bsps/arm/shared/serial/arm-pl050.c - bsps/arm/shared/start/bsp-start-memcpy.S -- bsps/shared/dev/btimer/btimer-stub.c +- bsps/shared/dev/btimer/btimer-cpucounter.c - bsps/shared/dev/getentropy/getentropy-cpucounter.c - bsps/shared/dev/irq/arm-gicv2.c - bsps/shared/dev/irq/arm-gicv2-get-attributes.c diff --git a/spec/build/bsps/arm/stm32f4/obj.yml b/spec/build/bsps/arm/stm32f4/obj.yml index 7c5427719e..e5c2b77f8a 100644 --- a/spec/build/bsps/arm/stm32f4/obj.yml +++ b/spec/build/bsps/arm/stm32f4/obj.yml @@ -55,7 +55,7 @@ source: - bsps/arm/stm32f4/start/rcc.c - bsps/arm/stm32f4/start/start-config-io.c - bsps/shared/cache/nocache.c -- bsps/shared/dev/btimer/btimer-stub.c +- bsps/shared/dev/btimer/btimer-cpucounter.c - bsps/shared/dev/cpucounter/cpucounterfrequency.c - bsps/shared/dev/cpucounter/cpucounterread.c - bsps/shared/dev/getentropy/getentropy-cpucounter.c diff --git a/spec/build/bsps/arm/stm32h7/obj.yml b/spec/build/bsps/arm/stm32h7/obj.yml index 1ba7b65f5d..c0d5af411a 100644 --- a/spec/build/bsps/arm/stm32h7/obj.yml +++ b/spec/build/bsps/arm/stm32h7/obj.yml @@ -330,7 +330,7 @@ source: - bsps/arm/stm32h7/start/stm32h7-hal-uart.c - bsps/arm/stm32h7/start/stm32h7-hal.c - bsps/arm/stm32h7/start/system_stm32h7xx.c -- bsps/shared/dev/btimer/btimer-stub.c +- bsps/shared/dev/btimer/btimer-cpucounter.c - bsps/shared/dev/rtc/rtc-support.c - bsps/shared/dev/serial/console-termios.c - bsps/shared/irq/irq-default-handler.c diff --git a/spec/build/bsps/arm/xen/bspxen.yml b/spec/build/bsps/arm/xen/bspxen.yml index 00959ed757..73f71dc877 100644 --- a/spec/build/bsps/arm/xen/bspxen.yml +++ b/spec/build/bsps/arm/xen/bspxen.yml @@ -70,7 +70,7 @@ source: - bsps/arm/xen/start/bspstart.c - bsps/arm/xen/start/bspstarthooks.c - bsps/arm/xen/start/bspstartmmu.c -- bsps/shared/dev/btimer/btimer-stub.c +- bsps/shared/dev/btimer/btimer-cpucounter.c - bsps/shared/dev/clock/arm-generic-timer.c - bsps/shared/dev/getentropy/getentropy-cpucounter.c - bsps/shared/dev/irq/arm-gicv2.c diff --git a/spec/build/bsps/arm/xilinx-zynq/obj.yml b/spec/build/bsps/arm/xilinx-zynq/obj.yml index dcac09126b..a279f4085f 100644 --- a/spec/build/bsps/arm/xilinx-zynq/obj.yml +++ b/spec/build/bsps/arm/xilinx-zynq/obj.yml @@ -35,7 +35,7 @@ source: - bsps/arm/xilinx-zynq/start/bspstart.c - bsps/arm/xilinx-zynq/start/bspstarthooks.c - bsps/arm/xilinx-zynq/start/bspstartmmu.c -- bsps/shared/dev/btimer/btimer-stub.c +- bsps/shared/dev/btimer/btimer-cpucounter.c - bsps/shared/dev/getentropy/getentropy-cpucounter.c - bsps/shared/dev/irq/arm-gicv2.c - bsps/shared/dev/irq/arm-gicv2-get-attributes.c diff --git a/spec/build/bsps/arm/xilinx-zynqmp/bspxilinxzynqmp.yml b/spec/build/bsps/arm/xilinx-zynqmp/bspxilinxzynqmp.yml index b0b6344d2e..d212a061f3 100644 --- a/spec/build/bsps/arm/xilinx-zynqmp/bspxilinxzynqmp.yml +++ b/spec/build/bsps/arm/xilinx-zynqmp/bspxilinxzynqmp.yml @@ -93,7 +93,7 @@ source: - bsps/arm/xilinx-zynqmp/start/bspstart.c - bsps/arm/xilinx-zynqmp/start/bspstarthooks.c - bsps/arm/xilinx-zynqmp/start/bspstartmmu.c -- bsps/shared/dev/btimer/btimer-stub.c +- bsps/shared/dev/btimer/btimer-cpucounter.c - bsps/shared/dev/clock/arm-generic-timer.c - bsps/shared/dev/getentropy/getentropy-cpucounter.c - bsps/shared/dev/irq/arm-gicv2.c diff --git a/spec/build/bsps/mips/malta/bspmalta.yml b/spec/build/bsps/mips/malta/bspmalta.yml index a3651cb00a..cd7c33ee33 100644 --- a/spec/build/bsps/mips/malta/bspmalta.yml +++ b/spec/build/bsps/mips/malta/bspmalta.yml @@ -57,7 +57,7 @@ source: - bsps/mips/shared/irq/vectorexceptions.c - bsps/mips/shared/start/idttlb.S - bsps/shared/cache/nocache.c -- bsps/shared/dev/btimer/btimer-stub.c +- bsps/shared/dev/btimer/btimer-cpucounter.c - bsps/shared/dev/getentropy/getentropy-cpucounter.c - bsps/shared/dev/pci/pci_find_device.c - bsps/shared/dev/serial/legacy-console-control.c diff --git a/spec/build/bsps/moxie/moxiesim/bspmoxiesim.yml b/spec/build/bsps/moxie/moxiesim/bspmoxiesim.yml index 0564995537..bd9369fe85 100644 --- a/spec/build/bsps/moxie/moxiesim/bspmoxiesim.yml +++ b/spec/build/bsps/moxie/moxiesim/bspmoxiesim.yml @@ -43,7 +43,7 @@ source: - bsps/moxie/moxiesim/console/console-io.c - bsps/moxie/moxiesim/console/syscalls.S - bsps/shared/cache/nocache.c -- bsps/shared/dev/btimer/btimer-stub.c +- bsps/shared/dev/btimer/btimer-cpucounter.c - bsps/shared/dev/clock/clock-simidle.c - bsps/shared/dev/getentropy/getentropy-cpucounter.c - bsps/shared/dev/serial/console-polled.c diff --git a/spec/build/bsps/powerpc/t32mppc/bspt32mppc.yml b/spec/build/bsps/powerpc/t32mppc/bspt32mppc.yml index dc384e7167..ec13653991 100644 --- a/spec/build/bsps/powerpc/t32mppc/bspt32mppc.yml +++ b/spec/build/bsps/powerpc/t32mppc/bspt32mppc.yml @@ -62,7 +62,7 @@ source: - bsps/powerpc/t32mppc/irq/irq.c - bsps/powerpc/t32mppc/start/bspreset.c - bsps/powerpc/t32mppc/start/bspstart.c -- bsps/shared/dev/btimer/btimer-stub.c +- bsps/shared/dev/btimer/btimer-cpucounter.c - bsps/shared/dev/getentropy/getentropy-cpucounter.c - bsps/shared/dev/serial/console-termios.c - bsps/shared/irq/irq-default-handler.c diff --git a/spec/build/bsps/riscv/griscv/obj.yml b/spec/build/bsps/riscv/griscv/obj.yml index cb68f87c36..fd06af7077 100644 --- a/spec/build/bsps/riscv/griscv/obj.yml +++ b/spec/build/bsps/riscv/griscv/obj.yml @@ -26,7 +26,7 @@ source: - bsps/riscv/griscv/start/bsp_fatal_halt.c - bsps/riscv/griscv/start/bspstart.c - bsps/shared/cache/nocache.c -- bsps/shared/dev/btimer/btimer-stub.c +- bsps/shared/dev/btimer/btimer-cpucounter.c - bsps/shared/dev/getentropy/getentropy-cpucounter.c - bsps/shared/dev/serial/console-termios.c - bsps/shared/irq/irq-default-handler.c diff --git a/spec/build/bsps/sh/shsim/obj.yml b/spec/build/bsps/sh/shsim/obj.yml index 16fd97c7ea..1390f4a8ed 100644 --- a/spec/build/bsps/sh/shsim/obj.yml +++ b/spec/build/bsps/sh/shsim/obj.yml @@ -30,7 +30,7 @@ source: - bsps/sh/shsim/start/ispshgdb.c - bsps/sh/shsim/start/sysexit.c - bsps/shared/cache/nocache.c -- bsps/shared/dev/btimer/btimer-stub.c +- bsps/shared/dev/btimer/btimer-cpucounter.c - bsps/shared/dev/clock/clock-simidle.c - bsps/shared/dev/getentropy/getentropy-cpucounter.c - bsps/shared/dev/serial/console-polled.c diff --git a/spec/build/bsps/sparc64/niagara/bspniagara.yml b/spec/build/bsps/sparc64/niagara/bspniagara.yml index f9d55b50d4..74ae12944b 100644 --- a/spec/build/bsps/sparc64/niagara/bspniagara.yml +++ b/spec/build/bsps/sparc64/niagara/bspniagara.yml @@ -40,7 +40,7 @@ links: uid: ../../bspopts source: - bsps/shared/cache/nocache.c -- bsps/shared/dev/btimer/btimer-stub.c +- bsps/shared/dev/btimer/btimer-cpucounter.c - bsps/shared/dev/getentropy/getentropy-cpucounter.c - bsps/shared/dev/serial/legacy-console-control.c - bsps/shared/dev/serial/legacy-console-select.c diff --git a/spec/build/bsps/sparc64/usiii/bspusiii.yml b/spec/build/bsps/sparc64/usiii/bspusiii.yml index c63f33fcf7..4dbccb8a89 100644 --- a/spec/build/bsps/sparc64/usiii/bspusiii.yml +++ b/spec/build/bsps/sparc64/usiii/bspusiii.yml @@ -42,7 +42,7 @@ links: uid: ../../bspopts source: - bsps/shared/cache/nocache.c -- bsps/shared/dev/btimer/btimer-stub.c +- bsps/shared/dev/btimer/btimer-cpucounter.c - bsps/shared/dev/getentropy/getentropy-cpucounter.c - bsps/shared/dev/serial/legacy-console-control.c - bsps/shared/dev/serial/legacy-console-select.c diff --git a/spec/build/bsps/v850/gdbv850sim/obj.yml b/spec/build/bsps/v850/gdbv850sim/obj.yml index fae94efd02..20759b99a6 100644 --- a/spec/build/bsps/v850/gdbv850sim/obj.yml +++ b/spec/build/bsps/v850/gdbv850sim/obj.yml @@ -22,7 +22,7 @@ install: links: [] source: - bsps/shared/cache/nocache.c -- bsps/shared/dev/btimer/btimer-stub.c +- bsps/shared/dev/btimer/btimer-cpucounter.c - bsps/shared/dev/clock/clock-simidle.c - bsps/shared/dev/getentropy/getentropy-cpucounter.c - bsps/shared/dev/serial/console-polled.c diff --git a/spec/build/bsps/x86_64/amd64/bspamd64.yml b/spec/build/bsps/x86_64/amd64/bspamd64.yml index 4b720d79be..33d78bec48 100644 --- a/spec/build/bsps/x86_64/amd64/bspamd64.yml +++ b/spec/build/bsps/x86_64/amd64/bspamd64.yml @@ -40,7 +40,7 @@ links: uid: ../../bspopts source: - bsps/shared/cache/nocache.c -- bsps/shared/dev/btimer/btimer-stub.c +- bsps/shared/dev/btimer/btimer-cpucounter.c - bsps/shared/dev/getentropy/getentropy-cpucounter.c - bsps/shared/dev/serial/console-termios-init.c - bsps/shared/dev/serial/console-termios.c -- cgit v1.2.3