Merge pull request #479 from ckormanyos/update_boost_benchmarks

Update boost benchmarks
ckormanyos · Feb 24, 2024 · e264728 · e264728
2 parents 89fab35 + 4d94d5d
commit e264728
Show file tree

Hide file tree

Showing 19 changed files with 79 additions and 51 deletions.
diff --git a/ref_app/src/app/benchmark/app_benchmark_boost_math_cbrt_tgamma.cpp b/ref_app/src/app/benchmark/app_benchmark_boost_math_cbrt_tgamma.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-//  Copyright Christopher Kormanyos 2021 - 2022.
+//  Copyright Christopher Kormanyos 2021 - 2024.
 //  Distributed under the Boost Software License,
 //  Version 1.0. (See accompanying file LICENSE_1_0.txt
 //  or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -22,16 +22,16 @@
 #define BOOST_MATH_STANDALONE
 #endif
 
-#if !defined(BOOST_NO_RTTI)
-#define BOOST_NO_RTTI
+#if !defined(BOOST_MATH_NO_RTTI)
+#define BOOST_MATH_NO_RTTI
 #endif
 
-#if !defined(BOOST_DISABLE_THREADS)
-#define BOOST_DISABLE_THREADS
+#if !defined(BOOST_MATH_DISABLE_THREADS)
+#define BOOST_MATH_DISABLE_THREADS
 #endif
 
-#if !defined(BOOST_NO_EXCEPTIONS)
-#define BOOST_NO_EXCEPTIONS
+#if !defined(BOOST_MATH_NO_EXCEPTIONS)
+#define BOOST_MATH_NO_EXCEPTIONS
 #endif
 
 #if !defined(BOOST_MATH_MAX_SERIES_ITERATION_POLICY)

diff --git a/ref_app/src/app/benchmark/app_benchmark_boost_math_cyl_bessel_j.cpp b/ref_app/src/app/benchmark/app_benchmark_boost_math_cyl_bessel_j.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-//  Copyright Christopher Kormanyos 2021 - 2022.
+//  Copyright Christopher Kormanyos 2021 - 2024.
 //  Distributed under the Boost Software License,
 //  Version 1.0. (See accompanying file LICENSE_1_0.txt
 //  or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -24,16 +24,16 @@
 #define BOOST_MATH_STANDALONE
 #endif
 
-#if !defined(BOOST_NO_RTTI)
-#define BOOST_NO_RTTI
+#if !defined(BOOST_MATH_NO_RTTI)
+#define BOOST_MATH_NO_RTTI
 #endif
 
-#if !defined(BOOST_DISABLE_THREADS)
-#define BOOST_DISABLE_THREADS
+#if !defined(BOOST_MATH_DISABLE_THREADS)
+#define BOOST_MATH_DISABLE_THREADS
 #endif
 
-#if !defined(BOOST_NO_EXCEPTIONS)
-#define BOOST_NO_EXCEPTIONS
+#if !defined(BOOST_MATH_NO_EXCEPTIONS)
+#define BOOST_MATH_NO_EXCEPTIONS
 #endif
 
 #if !defined(BOOST_MATH_DISABLE_STD_FPCLASSIFY)

diff --git a/ref_app/src/app/benchmark/app_benchmark_boost_multiprecision_cbrt.cpp b/ref_app/src/app/benchmark/app_benchmark_boost_multiprecision_cbrt.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-//  Copyright Christopher Kormanyos 2021 - 2022.
+//  Copyright Christopher Kormanyos 2021 - 2024.
 //  Distributed under the Boost Software License,
 //  Version 1.0. (See accompanying file LICENSE_1_0.txt
 //  or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -25,23 +25,26 @@
 #define BOOST_MATH_STANDALONE
 #endif
 
-#if !defined(BOOST_NO_RTTI)
-#define BOOST_NO_RTTI
+#if !defined(BOOST_MATH_NO_RTTI)
+#define BOOST_MATH_NO_RTTI
 #endif
 
-#if !defined(BOOST_DISABLE_THREADS)
-#define BOOST_DISABLE_THREADS
+#if !defined(BOOST_MATH_DISABLE_THREADS)
+#define BOOST_MATH_DISABLE_THREADS
 #endif
 
-#if !defined(BOOST_NO_EXCEPTIONS)
-#define BOOST_NO_EXCEPTIONS
+#if !defined(BOOST_MATH_NO_EXCEPTIONS)
+#define BOOST_MATH_NO_EXCEPTIONS
+#endif
+
+#if !defined(BOOST_MP_NO_EXCEPTIONS)
+#define BOOST_MP_NO_EXCEPTIONS
 #endif
 
-#if !defined(BOOST_NO_CXX11_THREAD_LOCAL)
-#define BOOST_NO_CXX11_THREAD_LOCAL
+#if !defined(BOOST_NO_EXCEPTIONS)
+#define BOOST_NO_EXCEPTIONS
 #endif
 
-#include <boost/config.hpp>
 #include <boost/math/special_functions/cbrt.hpp>
 #if defined(APP_BENCHMARK_TYPE_BOOST_BOOST_MULTIPRECISION_CBRT_USE_BIN_FLOAT)
 #include <boost/multiprecision/cpp_bin_float.hpp>

diff --git a/ref_app/target/micros/am335x/make/am335x.ld b/ref_app/target/micros/am335x/make/am335x.ld
@@ -1,7 +1,7 @@
 
 /*
  Copyright Michael Schnerr 2011 - 2014.
- Copyright Christopher Kormanyos 2007 - 2022.
+ Copyright Christopher Kormanyos 2007 - 2024.
  Distributed under the Boost Software License,
  Version 1.0. (See accompanying file LICENSE_1_0.txt
  or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -101,6 +101,7 @@ SECTIONS
   {
     . = ALIGN(4);
     *(.ARM.extab)
+    *(.ARM.extab*)
     *(.gnu.linkonce.armextab.*)
     . = ALIGN(4);
   } > ROM

diff --git a/ref_app/target/micros/bcm2835_raspi_b/make/bcm2835_raspi_b.ld b/ref_app/target/micros/bcm2835_raspi_b/make/bcm2835_raspi_b.ld
@@ -1,5 +1,5 @@
 /*
- Copyright Christopher Kormanyos 2013 - 2021.
+ Copyright Christopher Kormanyos 2013 - 2024.
  Distributed under the Boost Software License,
  Version 1.0. (See accompanying file LICENSE_1_0.txt
  or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -92,6 +92,7 @@ SECTIONS
   {
     . = ALIGN(4);
     *(.ARM.extab)
+    *(.ARM.extab*)
     *(.gnu.linkonce.armextab.*)
     . = ALIGN(4);
   } > ROM

diff --git a/ref_app/target/micros/bcm2835_raspi_b/make/bcm2835_raspi_b_with_stdlib.ld b/ref_app/target/micros/bcm2835_raspi_b/make/bcm2835_raspi_b_with_stdlib.ld
@@ -1,5 +1,5 @@
 /*
- Copyright Christopher Kormanyos 2013 - 2021.
+ Copyright Christopher Kormanyos 2013 - 2024.
  Distributed under the Boost Software License,
  Version 1.0. (See accompanying file LICENSE_1_0.txt
  or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -92,6 +92,7 @@ SECTIONS
   {
     . = ALIGN(4);
     *(.ARM.extab)
+    *(.ARM.extab*)
     *(.gnu.linkonce.armextab.*)
     . = ALIGN(4);
   } > ROM

diff --git a/ref_app/target/micros/nxp_imxrt1062/make/nxp_imxrt1062.ld b/ref_app/target/micros/nxp_imxrt1062/make/nxp_imxrt1062.ld
@@ -1,6 +1,6 @@
 
 /*
- Copyright Christopher Kormanyos 2007 - 2022.
+ Copyright Christopher Kormanyos 2007 - 2024.
  Distributed under the Boost Software License,
  Version 1.0. (See accompanying file LICENSE_1_0.txt
  or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -91,6 +91,7 @@ SECTIONS
   {
     . = ALIGN(4);
     *(.ARM.extab)
+    *(.ARM.extab*)
     *(.gnu.linkonce.armextab.*)
     . = ALIGN(4);
   } > ROM

diff --git a/ref_app/target/micros/stm32f100/make/stm32f100.ld b/ref_app/target/micros/stm32f100/make/stm32f100.ld
@@ -1,5 +1,5 @@
 /*
- Copyright Christopher Kormanyos 2007 - 2023.
+ Copyright Christopher Kormanyos 2007 - 2024.
  Distributed under the Boost Software License,
  Version 1.0. (See accompanying file LICENSE_1_0.txt
  or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -70,6 +70,7 @@ SECTIONS
   {
     . = ALIGN(4);
     *(.ARM.extab)
+    *(.ARM.extab*)
     *(.gnu.linkonce.armextab.*)
     . = ALIGN(4);
   } > ROM

diff --git a/ref_app/target/micros/stm32f407/make/stm32f407.ld b/ref_app/target/micros/stm32f407/make/stm32f407.ld
@@ -1,6 +1,6 @@
 
 /*
- Copyright Christopher Kormanyos 2007 - 2022.
+ Copyright Christopher Kormanyos 2007 - 2024.
  Distributed under the Boost Software License,
  Version 1.0. (See accompanying file LICENSE_1_0.txt
  or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -81,6 +81,7 @@ SECTIONS
   {
     . = ALIGN(4);
     *(.ARM.extab)
+    *(.ARM.extab*)
     *(.gnu.linkonce.armextab.*)
     . = ALIGN(4);
   } > ROM

diff --git a/ref_app/target/micros/stm32f429/make/stm32f429.ld b/ref_app/target/micros/stm32f429/make/stm32f429.ld
@@ -1,11 +1,12 @@
+
 /*
- Copyright Christopher Kormanyos 2007 - 2022.
+ Copyright Christopher Kormanyos 2007 - 2024.
  Distributed under the Boost Software License,
  Version 1.0. (See accompanying file LICENSE_1_0.txt
  or copy at http://www.boost.org/LICENSE_1_0.txt)
 */
 
-/* Linker script for STM32F4xx ARM(R) Cortex(TM)-M4 MCU */
+/* Linker script for STM32F4x ARM(R) Cortex(TM)-M4 MCU */
 
 ENTRY(__my_startup)
 
@@ -15,23 +16,23 @@ OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm")
 OUTPUT_ARCH(arm)
 
 /* The beginning and end of the program ROM area */
-/* Set up a ROM area with a size of 64K */
-_rom_size  = 0x00010000;
+/* Set up a ROM area with a size of 512K */
+_rom_size  = 0x00080000;
 _rom_begin = 0x08000000;
 _rom_end   = _rom_begin + _rom_size;
 
 /* The beginning and end (i.e., the top) of the stack */
-/* Set up a stack with a size of 4K */
-_stack_begin = 0x20007000;
-_stack_end   = 0x20008000;
+/* Set up a stack with a size of 16K */
+_stack_begin = 0x2000C000;
+_stack_end   = 0x20010000;
 
 __initial_stack_pointer = _stack_end - 4;
 
 MEMORY
 {
   VEC(rx)  : ORIGIN = 0x08000000, LENGTH = 0x300
   ROM(rx)  : ORIGIN = 0x08000300, LENGTH = _rom_size - 0x300
-  RAM(rwx) : ORIGIN = 0x20000000, LENGTH = 0x7000
+  RAM(rwx) : ORIGIN = 0x20000000, LENGTH = 0x0C000
 }
 
 SECTIONS
@@ -82,6 +83,7 @@ SECTIONS
   {
     . = ALIGN(4);
     *(.ARM.extab)
+    *(.ARM.extab*)
     *(.gnu.linkonce.armextab.*)
     . = ALIGN(4);
   } > ROM

diff --git a/ref_app/target/micros/stm32f429/make/stm32f429_flags.gmk b/ref_app/target/micros/stm32f429/make/stm32f429_flags.gmk
@@ -35,12 +35,13 @@ TGT_CXXFLAGS  = -std=c++14
                 -Wno-psabi                                                        \
                 $(TGT_ALLFLAGS)
 
-TGT_INCLUDES  = -I$(PATH_APP)/util/STL
+TGT_INCLUDES  = -IC:/boost/modular_boost/libs/config/include                      \
+                -IC:/boost/modular_boost/libs/math/include                        \
+                -IC:/boost/modular_boost/libs/multiprecision/include
 
 TGT_AFLAGS    =
 
-TGT_LDFLAGS   = -nostdlib                                                         \
-                -nostartfiles                                                     \
+TGT_LDFLAGS   = -nostartfiles                                                     \
                 -Wl,--gc-sections                                                 \
                 -Wl,-Map,$(APP).map                                               \
                 -T $(LINKER_DEFINITION_FILE)
diff --git a/ref_app/target/micros/stm32f429/make/stm32f429_with_stdlib.ld b/ref_app/target/micros/stm32f429/make/stm32f429_with_stdlib.ld
@@ -1,6 +1,6 @@
 
 /*
- Copyright Christopher Kormanyos 2007 - 2022.
+ Copyright Christopher Kormanyos 2007 - 2024.
  Distributed under the Boost Software License,
  Version 1.0. (See accompanying file LICENSE_1_0.txt
  or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -83,6 +83,7 @@ SECTIONS
   {
     . = ALIGN(4);
     *(.ARM.extab)
+    *(.ARM.extab*)
     *(.gnu.linkonce.armextab.*)
     . = ALIGN(4);
   } > ROM

diff --git a/ref_app/target/micros/stm32f446/make/stm32f446.ld b/ref_app/target/micros/stm32f446/make/stm32f446.ld
@@ -1,5 +1,5 @@
 /*
- Copyright Christopher Kormanyos 2007 - 2023.
+ Copyright Christopher Kormanyos 2007 - 2024.
  Distributed under the Boost Software License,
  Version 1.0. (See accompanying file LICENSE_1_0.txt
  or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -74,6 +74,7 @@ SECTIONS
   {
     . = ALIGN(4);
     *(.ARM.extab)
+    *(.ARM.extab*)
     *(.gnu.linkonce.armextab.*)
     . = ALIGN(4);
   } > ROM

diff --git a/ref_app/target/micros/stm32f446/make/stm32f446_flags.gmk b/ref_app/target/micros/stm32f446/make/stm32f446_flags.gmk
@@ -33,15 +33,13 @@ TGT_CFLAGS    = -std=c99
 
 TGT_CXXFLAGS  = -std=c++14                                                        \
                 -Wno-psabi                                                        \
-                -ffreestanding                                                    \
                 $(TGT_ALLFLAGS)
 
 TGT_INCLUDES  = -I$(PATH_APP)/util/STL
 
 TGT_AFLAGS    =
 
-TGT_LDFLAGS   = -nostdlib                                                         \
-                -nostartfiles                                                     \
+TGT_LDFLAGS   = -nostartfiles                                                     \
                 -Wl,--gc-sections                                                 \
                 -Wl,-Map,$(APP).map                                               \
                 -T $(LINKER_DEFINITION_FILE)
diff --git a/ref_app/target/micros/stm32f446/make/stm32f446_with_stdlib.ld b/ref_app/target/micros/stm32f446/make/stm32f446_with_stdlib.ld
@@ -1,5 +1,5 @@
 /*
- Copyright Christopher Kormanyos 2007 - 2023.
+ Copyright Christopher Kormanyos 2007 - 2024.
  Distributed under the Boost Software License,
  Version 1.0. (See accompanying file LICENSE_1_0.txt
  or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -82,6 +82,7 @@ SECTIONS
   {
     . = ALIGN(4);
     *(.ARM.extab)
+    *(.ARM.extab*)
     *(.gnu.linkonce.armextab.*)
     . = ALIGN(4);
   } > ROM

diff --git a/ref_app/target/micros/stm32f446/startup/crt0_init_ram.cpp b/ref_app/target/micros/stm32f446/startup/crt0_init_ram.cpp
@@ -1,10 +1,17 @@
 ///////////////////////////////////////////////////////////////////////////////
-//  Copyright Christopher Kormanyos 2007 - 2023.
+//  Copyright Christopher Kormanyos 2007 - 2024.
 //  Distributed under the Boost Software License,
 //  Version 1.0. (See accompanying file LICENSE_1_0.txt
 //  or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
 
+#if defined(__GNUC__) && (__GNUC__ >= 12)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Warray-bounds"
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wstringop-overflow"
+#endif
+
 #include <algorithm>
 #include <cstddef>
 #include <cstdint>
@@ -43,3 +50,8 @@ void crt::init_ram()
             static_cast<memory_aligned_type*>(static_cast<void*>(&_bss_end)),
             static_cast<memory_aligned_type>(0U));
 }
+
+#if defined(__GNUC__) && (__GNUC__ >= 12)
+#pragma GCC diagnostic pop
+#pragma GCC diagnostic pop
+#endif
diff --git a/ref_app/target/micros/stm32h7a3/make/stm32h7a3.ld b/ref_app/target/micros/stm32h7a3/make/stm32h7a3.ld
@@ -1,6 +1,6 @@
 
 /*
- Copyright Christopher Kormanyos 2007 - 2022.
+ Copyright Christopher Kormanyos 2007 - 2024.
  Distributed under the Boost Software License,
  Version 1.0. (See accompanying file LICENSE_1_0.txt
  or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -83,6 +83,7 @@ SECTIONS
   {
     . = ALIGN(4);
     *(.ARM.extab)
+    *(.ARM.extab*)
     *(.gnu.linkonce.armextab.*)
     . = ALIGN(4);
   } > ROM

diff --git a/ref_app/target/micros/stm32h7a3/make/stm32h7a3_with_stdlib.ld b/ref_app/target/micros/stm32h7a3/make/stm32h7a3_with_stdlib.ld
@@ -1,6 +1,6 @@
 
 /*
- Copyright Christopher Kormanyos 2007 - 2022.
+ Copyright Christopher Kormanyos 2007 - 2024.
  Distributed under the Boost Software License,
  Version 1.0. (See accompanying file LICENSE_1_0.txt
  or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -83,6 +83,7 @@ SECTIONS
   {
     . = ALIGN(4);
     *(.ARM.extab)
+    *(.ARM.extab*)
     *(.gnu.linkonce.armextab.*)
     . = ALIGN(4);
   } > ROM