⚗️ Add nearpoint targets to benchmark/conanfile.py

- Consolidated generated_tests, test lists,
- Consolidate

Author: kammce

.github/workflows/demo_check.yml

@@ -38,7 +38,7 @@ jobs:
       compiler_profile: ${{ inputs.compiler_profile }}
       platform_profile_url: ${{ inputs.platform_profile_url }}
       platform_profile: ${{ inputs.platform_profile }}
-    secrets: inherit 
+    secrets: inherit
 
   build_debug: # STOLEN from libhal/ci
     runs-on: ubuntu-22.04
@@ -59,7 +59,7 @@ jobs:
       - name: 📥 Install Conan ${{ inputs.conan_version }}
         if: ${{ inputs.conan_version != '' }}
         run: pipx install conan==${{ inputs.conan_version }}
-      
+
       - name: 📥 Install Conan Latest
         if: ${{ inputs.conan_version == '' }}
         run: pipx install conan
@@ -106,13 +106,13 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get install qemu-system-arm gdb-multiarch
-          
+
       - name: Trim profile version
         id: trim
         run: |
           profile="${{ inputs.platform_profile }}"
           echo "trimmed=${profile##*/}" >> $GITHUB_OUTPUT
-      
+
       - name: Download Build Artifacts
         uses: actions/download-artifact@v4
         with:
@@ -134,7 +134,7 @@ jobs:
             -ex "monitor quit"                                                                                \
             ${{ github.workspace }}/${{ steps.trim.outputs.trimmed }}/Debug/single_level.elf                  \
             > gdb.log || {
-              # Make timeouts more explicit  
+              # Make timeouts more explicit
               code=$?
               if [ "$code" -eq 124 ]; then
                 echo "❌ GDB timeout after 5 seconds" >&2
@@ -157,13 +157,13 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get install qemu-system-arm gdb-multiarch
-          
+
       - name: Trim profile version
         id: trim
         run: |
           profile="${{ inputs.platform_profile }}"
           echo "trimmed=${profile##*/}" >> $GITHUB_OUTPUT
-      
+
       - name: Download Build Artifacts
         uses: actions/download-artifact@v4
         with:
@@ -185,7 +185,7 @@ jobs:
             -ex "monitor quit"                                                                                  \
             ${{ github.workspace }}/${{ steps.trim.outputs.trimmed }}/Debug/multiple_inheritance.elf            \
             > gdb.log || {
-              # Make timeouts more explicit  
+              # Make timeouts more explicit
               code=$?
               if [ "$code" -eq 124 ]; then
                 echo "❌ GDB timeout after 5 seconds" >&2
@@ -199,4 +199,3 @@ jobs:
         run: |
           cat gdb.log
           grep -q "New value = 0x6666" gdb.log
-        

benchmark/CMakeLists.txt

@@ -63,30 +63,73 @@ endif()
 # Glob all the files in the directory 'generated_tests'
 file(GLOB GENERATED_TEST "${CMAKE_CURRENT_SOURCE_DIR}/generated_tests/*.cpp")
 
+set(BENCHMARK_COMPILE_OPTIONS
+    -g
+    -Werror
+    -Wall
+    -Wextra
+    -Wshadow
+    -fno-threadsafe-statics)
+
 foreach(test_path ${GENERATED_TEST})
   get_filename_component(test_file_name ${test_path} NAME)
   set(elf ${test_file_name}.elf)
+
   message(STATUS "Generating Demo for \"${elf}\"")
   add_executable(${elf} ${test_path})
-
   target_include_directories(${elf} PRIVATE .)
-  target_compile_options(${elf} PRIVATE
-    -g
-    -Werror
-    -Wall
-    -Wextra
-    -Wshadow
-    -fno-threadsafe-statics
-    $<$<COMPILE_LANGUAGE:CXX>:-fexceptions -fno-rtti>
-  )
+  target_compile_options(${elf} PRIVATE ${BENCHMARK_COMPILE_OPTIONS})
+
+  # Check if the test file name starts with "result_"
+  string(REGEX MATCH "^result_" is_result_file ${test_file_name})
+  if(is_result_file)
+    target_compile_options(${elf} PRIVATE
+      $<$<COMPILE_LANGUAGE:CXX>:-fno-exceptions>)
+  else()
+    target_compile_options(${elf} PRIVATE
+      $<$<COMPILE_LANGUAGE:CXX>:-fexceptions>)
+  endif()
 
   target_link_libraries(${elf} PRIVATE
     startup_code
     libhal::$ENV{LIBHAL_PLATFORM_LIBRARY}
   )
+  target_link_options(${elf} PRIVATE -fno-threadsafe-statics
+    -L${CMAKE_SOURCE_DIR}/
+    -Wl,-Map=${CMAKE_BINARY_DIR}/${elf}.map
+  )
+  if(prebuilt-picolibc_FOUND)
+    target_link_libraries(${elf} PRIVATE picolibc)
+  endif()
 
-  target_link_options(${elf} PRIVATE -fno-threadsafe-statics)
+  if(${CMAKE_CROSSCOMPILING})
+    # Convert elf into .bin, .hex and other formats needed for programming
+    # devices.
+    libhal_post_build(${elf})
+    libhal_disassemble(${elf})
+  endif()
+endforeach()
 
+# Build nearpoint binary if if available
+if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/nearpoint.cpp")
+  message(STATUS "nearpoint.cpp exists!")
+  set(elf nearpoint.cpp.elf)
+  message(STATUS "Generating Demo for \"${elf}\"")
+  add_executable(${elf} generated_tests/except.cpp nearpoint.cpp)
+  target_include_directories(${elf} PRIVATE .)
+  target_compile_options(${elf} PRIVATE
+    ${BENCHMARK_COMPILE_OPTIONS}
+    -fexceptions)
+
+  target_link_libraries(${elf} PRIVATE
+    startup_code
+    libhal::$ENV{LIBHAL_PLATFORM_LIBRARY}
+  )
+  target_link_options(${elf} PRIVATE -fno-threadsafe-statics
+    -L${CMAKE_SOURCE_DIR}/
+    -Wl,-Map=${CMAKE_BINARY_DIR}/${elf}.map
+    -Torder.ld
+  )
   if(prebuilt-picolibc_FOUND)
     target_link_libraries(${elf} PRIVATE picolibc)
   endif()
@@ -97,4 +140,6 @@ foreach(test_path ${GENERATED_TEST})
     libhal_post_build(${elf})
     libhal_disassemble(${elf})
   endif()
-endforeach()
+else()
+    message(WARNING "nearpoint.cpp does not exist")
+endif()

benchmark/all_tests.csv

@@ -65,4 +65,4 @@ def requirements(self):
         bootstrap = self.python_requires["libhal-bootstrap"]
         bootstrap.module.add_demo_requirements(self)
         if self.options.platform != "mac":
-            self.requires("libhal-exceptions/1.3.2")
+            self.requires("libhal-exceptions/1.4.0")