Merge branch 'feature/ulp_binutils_multi_target' into 'master'

ulp: support the new multi-target ULP-FSM binutils

Closes IDFGH-4618

See merge request espressif/esp-idf!19818

components/ulp/cmake/CMakeLists.txt

@@ -6,7 +6,7 @@ add_executable(${ULP_APP_NAME})
 
 option(ULP_COCPU_IS_RISCV "Use RISC-V based ULP" OFF)
 
-set(version_pattern "[a-z0-9\.-]+")
+set(version_pattern "[a-z0-9\.-_]+")
 
 # Check assembler version
 execute_process(
@@ -23,7 +23,7 @@ message(STATUS "Building ULP app ${ULP_APP_NAME}")
 # Check the supported assembler version
 if(NOT ULP_COCPU_IS_RISCV)
     message(STATUS "ULP assembler version: ${as_version}")
-    set(as_supported_version 2.28.51-esp-20191205)
+    set(as_supported_version 2.35_20220830)
 
     if(NOT as_version STREQUAL as_supported_version)
         message(WARNING "WARNING: ULP assembler version ${as_version} is not supported. Expected to see version: \

components/ulp/cmake/toolchain-esp32-ulp.cmake

@@ -1,19 +1,16 @@
 # CMake toolchain file for ULP
-
 set(CMAKE_SYSTEM_NAME Generic)
 
 # Compiler is only used for preprocessing
 set(CMAKE_C_COMPILER "xtensa-esp32-elf-gcc")
+set(CMAKE_CXX_COMPILER "xtensa-esp32-elf-g++")
 
 set(CMAKE_ASM_COMPILER "esp32ulp-elf-as")
 set(CMAKE_LINKER "esp32ulp-elf-ld")
 
-if(NOT ASM_DIALECT)
-    set(ASM_DIALECT "")
-endif()
 
 set(CMAKE_ASM${ASM_DIALECT}_COMPILE_OBJECT "${CMAKE_ASM${ASM_DIALECT}_COMPILER} \
-                                    <DEFINES> <INCLUDES> -o <OBJECT> -c <SOURCE>")
+                                    --mcpu=esp32 <DEFINES> <INCLUDES> -o <OBJECT> -c <SOURCE>")
 set(CMAKE_EXE_LINKER_FLAGS "-A elf32-esp32ulp -nostdlib" CACHE STRING "ULP Linker Base Flags")
 set(CMAKE_ASM_LINK_EXECUTABLE "${CMAKE_LINKER} <FLAGS> <CMAKE_ASM_LINK_FLAGS> \
                                 <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>")

components/ulp/cmake/toolchain-esp32s2-ulp.cmake

@@ -1,15 +1,15 @@
 # CMake toolchain file for ULP
-
 set(CMAKE_SYSTEM_NAME Generic)
 
 # Compiler is only used for preprocessing
 set(CMAKE_C_COMPILER "xtensa-esp32s2-elf-gcc")
+set(CMAKE_CXX_COMPILER "xtensa-esp32s2-elf-g++")
 
-set(CMAKE_ASM_COMPILER "esp32s2ulp-elf-as")
-set(CMAKE_LINKER "esp32s2ulp-elf-ld")
+set(CMAKE_ASM_COMPILER "esp32ulp-elf-as")
+set(CMAKE_LINKER "esp32ulp-elf-ld")
 
 set(CMAKE_ASM${ASM_DIALECT}_COMPILE_OBJECT "${CMAKE_ASM${ASM_DIALECT}_COMPILER} \
-                                    <DEFINES> <INCLUDES> -o <OBJECT> -c <SOURCE>")
+                                    --mcpu=esp32s2 <DEFINES> <INCLUDES> -o <OBJECT> -c <SOURCE>")
 set(CMAKE_EXE_LINKER_FLAGS "-A elf32-esp32s2ulp -nostdlib" CACHE STRING "ULP Linker Base Flags")
 set(CMAKE_ASM_LINK_EXECUTABLE "${CMAKE_LINKER} <FLAGS> <CMAKE_ASM_LINK_FLAGS> \
                                 <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>")

components/ulp/cmake/toolchain-esp32s3-ulp.cmake

@@ -1,16 +1,16 @@
 # CMake toolchain file for ULP
-
 set(CMAKE_SYSTEM_NAME Generic)
 
 # Compiler is only used for preprocessing
-#TODO: Update toolchain to be used once esp32s3 support is added to binutils
-set(CMAKE_C_COMPILER "xtensa-esp32s2-elf-gcc")
+set(CMAKE_C_COMPILER "xtensa-esp32s3-elf-gcc")
+set(CMAKE_CXX_COMPILER "xtensa-esp32s3-elf-g++")
 
-set(CMAKE_ASM_COMPILER "esp32s2ulp-elf-as")
-set(CMAKE_LINKER "esp32s2ulp-elf-ld")
+set(CMAKE_ASM_COMPILER "esp32ulp-elf-as")
+set(CMAKE_LINKER "esp32ulp-elf-ld")
 
+# Use ESP32-S2 ULP tools here, because ESP32-S3 uses the same ULP coprocessor type
 set(CMAKE_ASM${ASM_DIALECT}_COMPILE_OBJECT "${CMAKE_ASM${ASM_DIALECT}_COMPILER} \
-                                    <DEFINES> <INCLUDES> -o <OBJECT> -c <SOURCE>")
+                                    --mcpu=esp32s2 <DEFINES> <INCLUDES> -o <OBJECT> -c <SOURCE>")
 set(CMAKE_EXE_LINKER_FLAGS "-A elf32-esp32s2ulp -nostdlib" CACHE STRING "ULP Linker Base Flags")
 set(CMAKE_ASM_LINK_EXECUTABLE "${CMAKE_LINKER} <FLAGS> <CMAKE_ASM_LINK_FLAGS> \
                                 <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>")

docs/en/api-guides/tools/idf-tools-notes.inc

@@ -35,11 +35,6 @@
 .. tool-esp32ulp-elf-notes
 
 
----
-
-.. tool-esp32s2ulp-elf-notes
-
-
 ---
 
 .. tool-openocd-esp32-notes

docs/en/api-reference/system/ulp.rst

@@ -184,4 +184,4 @@ API Reference
 .. include-build-file:: inc/ulp_common.inc
 .. include-build-file:: inc/ulp_common_defs.inc
 
-.. _binutils-esp32ulp toolchain: https://github.com/espressif/binutils-esp32ulp
+.. _binutils-esp32ulp toolchain: https://github.com/espressif/binutils-gdb

docs/zh_CN/api-guides/tools/idf-tools-notes.inc

@@ -37,11 +37,6 @@
 .. tool-esp32ulp-elf-notes
 
 
----
-
-.. tool-esp32s2ulp-elf-notes
-
-
 ---
 
 .. tool-openocd-esp32-notes

docs/zh_CN/api-reference/system/ulp.rst

@@ -184,4 +184,4 @@ API 参考
 .. include-build-file:: inc/ulp_common.inc
 .. include-build-file:: inc/ulp_common_defs.inc
 
-.. _binutils-esp32ulp 工具链: https://github.com/espressif/binutils-esp32ulp
+.. _binutils-esp32ulp 工具链: https://github.com/espressif/binutils-gdb

tools/test_idf_tools/test_idf_tools.py

@@ -38,9 +38,6 @@ def redirect_stdout(target):
     import idf_tools
 
 ESP32ULP = 'esp32ulp-elf'
-ESP32ULP_ARCHIVE = 'binutils-esp32ulp'
-ESP32S2ULP = 'esp32s2ulp-elf'
-ESP32S2ULP_ARCHIVE = 'binutils-esp32s2ulp'
 OPENOCD = 'openocd-esp32'
 RISCV_ELF = 'riscv32-esp-elf'
 XTENSA_ESP32_ELF = 'xtensa-esp32-elf'
@@ -66,7 +63,6 @@ def get_version_dict():
 version_dict = get_version_dict()
 
 ESP32ULP_VERSION = version_dict[ESP32ULP]
-ESP32S2ULP_VERSION = version_dict[ESP32S2ULP]
 OPENOCD_VERSION = version_dict[OPENOCD]
 RISCV_ELF_VERSION = version_dict[RISCV_ELF]
 XTENSA_ESP32_ELF_VERSION = version_dict[XTENSA_ESP32_ELF]
@@ -136,8 +132,6 @@ def test_usage_basic(self):
         output = self.run_idf_tools_with_action(['list'])
         self.assertIn('* %s:' % ESP32ULP, output)
         self.assertIn('- %s (recommended)' % ESP32ULP_VERSION, output)
-        self.assertIn('* %s:' % ESP32S2ULP, output)
-        self.assertIn('- %s (recommended)' % ESP32S2ULP_VERSION, output)
         self.assertIn('* %s:' % OPENOCD, output)
         self.assertIn('- %s (recommended)' % OPENOCD_VERSION, output)
         self.assertIn('* %s:' % RISCV_ELF, output)
@@ -149,23 +143,21 @@ def test_usage_basic(self):
         self.assertIn('* %s:' % XTENSA_ESP32S3_ELF, output)
         self.assertIn('- %s (recommended)' % XTENSA_ESP32S3_ELF_VERSION, output)
 
-        required_tools_installed = 9
+        required_tools_installed = 8
         output = self.run_idf_tools_with_action(['install'])
         self.assert_tool_installed(output, OPENOCD, OPENOCD_VERSION)
         self.assert_tool_installed(output, RISCV_ELF, RISCV_ELF_VERSION)
         self.assert_tool_installed(output, XTENSA_ESP32_ELF, XTENSA_ESP32_ELF_VERSION)
         self.assert_tool_installed(output, XTENSA_ESP32S2_ELF, XTENSA_ESP32S2_ELF_VERSION)
         self.assert_tool_installed(output, XTENSA_ESP32S3_ELF, XTENSA_ESP32S3_ELF_VERSION)
-        self.assert_tool_installed(output, ESP32ULP, ESP32ULP_VERSION, ESP32ULP_ARCHIVE)
-        self.assert_tool_installed(output, ESP32S2ULP, ESP32S2ULP_VERSION, ESP32S2ULP_ARCHIVE)
+        self.assert_tool_installed(output, ESP32ULP, ESP32ULP_VERSION)
         self.assert_tool_installed(output, XTENSA_ESP_GDB, XTENSA_ESP_GDB_VERSION)
         self.assert_tool_installed(output, RISCV_ESP_GDB, RISCV_ESP_GDB_VERSION)
         self.assertIn('Destination: {}'.format(os.path.join(self.temp_tools_dir, 'dist')), output)
         self.assertEqual(required_tools_installed, output.count('Done'))
 
         output = self.run_idf_tools_with_action(['check'])
         self.assertIn('version installed in tools directory: ' + ESP32ULP_VERSION, output)
-        self.assertIn('version installed in tools directory: ' + ESP32S2ULP_VERSION, output)
         self.assertIn('version installed in tools directory: ' + OPENOCD_VERSION, output)
         self.assertIn('version installed in tools directory: ' + RISCV_ELF_VERSION, output)
         self.assertIn('version installed in tools directory: ' + XTENSA_ESP32_ELF_VERSION, output)
@@ -175,16 +167,14 @@ def test_usage_basic(self):
         self.assertIn('version installed in tools directory: ' + RISCV_ESP_GDB_VERSION, output)
 
         output = self.run_idf_tools_with_action(['export'])
-        self.assertIn('%s/tools/esp32ulp-elf/%s/esp32ulp-elf-binutils/bin' %
+        self.assertIn('%s/tools/esp32ulp-elf/%s/esp32ulp-elf/bin' %
                       (self.temp_tools_dir, ESP32ULP_VERSION), output)
         self.assertIn('%s/tools/xtensa-esp32-elf/%s/xtensa-esp32-elf/bin' %
                       (self.temp_tools_dir, XTENSA_ESP32_ELF_VERSION), output)
         self.assertIn('%s/tools/openocd-esp32/%s/openocd-esp32/bin' %
                       (self.temp_tools_dir, OPENOCD_VERSION), output)
         self.assertIn('%s/tools/riscv32-esp-elf/%s/riscv32-esp-elf/bin' %
                       (self.temp_tools_dir, RISCV_ELF_VERSION), output)
-        self.assertIn('%s/tools/esp32s2ulp-elf/%s/esp32s2ulp-elf-binutils/bin' %
-                      (self.temp_tools_dir, ESP32S2ULP_VERSION), output)
         self.assertIn('%s/tools/xtensa-esp32s2-elf/%s/xtensa-esp32s2-elf/bin' %
                       (self.temp_tools_dir, XTENSA_ESP32S2_ELF_VERSION), output)
         self.assertIn('%s/tools/xtensa-esp32s3-elf/%s/xtensa-esp32s3-elf/bin' %
@@ -199,12 +189,11 @@ def test_tools_for_esp32(self):
         output = self.run_idf_tools_with_action(['install', '--targets=esp32'])
         self.assert_tool_installed(output, XTENSA_ESP32_ELF, XTENSA_ESP32_ELF_VERSION)
         self.assert_tool_installed(output, OPENOCD, OPENOCD_VERSION)
-        self.assert_tool_installed(output, ESP32ULP, ESP32ULP_VERSION, ESP32ULP_ARCHIVE)
+        self.assert_tool_installed(output, ESP32ULP, ESP32ULP_VERSION)
         self.assert_tool_installed(output, XTENSA_ESP_GDB, XTENSA_ESP_GDB_VERSION)
         self.assert_tool_not_installed(output, RISCV_ELF, RISCV_ELF_VERSION)
         self.assert_tool_not_installed(output, XTENSA_ESP32S2_ELF, XTENSA_ESP32S2_ELF_VERSION)
         self.assert_tool_not_installed(output, XTENSA_ESP32S3_ELF, XTENSA_ESP32S3_ELF_VERSION)
-        self.assert_tool_not_installed(output, ESP32S2ULP, ESP32S2ULP_VERSION, ESP32S2ULP_ARCHIVE)
         self.assert_tool_not_installed(output, RISCV_ESP_GDB, RISCV_ESP_GDB_VERSION)
         self.assertIn('Destination: {}'.format(os.path.join(self.temp_tools_dir, 'dist')), output)
         self.assertEqual(required_tools_installed, output.count('Done'))
@@ -216,7 +205,7 @@ def test_tools_for_esp32(self):
         self.assertIn('version installed in tools directory: ' + XTENSA_ESP_GDB_VERSION, output)
 
         output = self.run_idf_tools_with_action(['export'])
-        self.assertIn('%s/tools/esp32ulp-elf/%s/esp32ulp-elf-binutils/bin' %
+        self.assertIn('%s/tools/esp32ulp-elf/%s/esp32ulp-elf/bin' %
                       (self.temp_tools_dir, ESP32ULP_VERSION), output)
         self.assertIn('%s/tools/xtensa-esp32-elf/%s/xtensa-esp32-elf/bin' %
                       (self.temp_tools_dir, XTENSA_ESP32_ELF_VERSION), output)
@@ -226,8 +215,6 @@ def test_tools_for_esp32(self):
                       (self.temp_tools_dir, XTENSA_ESP_GDB_VERSION), output)
         self.assertNotIn('%s/tools/riscv32-esp-elf/%s/riscv32-esp-elf/bin' %
                          (self.temp_tools_dir, RISCV_ELF_VERSION), output)
-        self.assertNotIn('%s/tools/esp32s2ulp-elf/%s/esp32s2ulp-elf-binutils/bin' %
-                         (self.temp_tools_dir, ESP32S2ULP_VERSION), output)
         self.assertNotIn('%s/tools/xtensa-esp32s2-elf/%s/xtensa-esp32s2-elf/bin' %
                          (self.temp_tools_dir, XTENSA_ESP32S2_ELF_VERSION), output)
         self.assertNotIn('%s/tools/xtensa-esp32s3-elf/%s/xtensa-esp32s3-elf/bin' %
@@ -244,8 +231,7 @@ def test_tools_for_esp32c3(self):
         self.assert_tool_not_installed(output, XTENSA_ESP32_ELF, XTENSA_ESP32_ELF_VERSION)
         self.assert_tool_not_installed(output, XTENSA_ESP32S2_ELF, XTENSA_ESP32S2_ELF_VERSION)
         self.assert_tool_not_installed(output, XTENSA_ESP32S3_ELF, XTENSA_ESP32S3_ELF_VERSION)
-        self.assert_tool_not_installed(output, ESP32ULP, ESP32ULP_VERSION, ESP32ULP_ARCHIVE)
-        self.assert_tool_not_installed(output, ESP32S2ULP, ESP32S2ULP_VERSION, ESP32S2ULP_ARCHIVE)
+        self.assert_tool_not_installed(output, ESP32ULP, ESP32ULP_VERSION)
         self.assert_tool_not_installed(output, XTENSA_ESP_GDB_VERSION, XTENSA_ESP_GDB_VERSION)
         self.assertIn('Destination: {}'.format(os.path.join(self.temp_tools_dir, 'dist')), output)
         self.assertEqual(required_tools_installed, output.count('Done'))
@@ -260,12 +246,10 @@ def test_tools_for_esp32c3(self):
                       (self.temp_tools_dir, OPENOCD_VERSION), output)
         self.assertIn('%s/tools/riscv32-esp-elf/%s/riscv32-esp-elf/bin' %
                       (self.temp_tools_dir, RISCV_ELF_VERSION), output)
-        self.assertNotIn('%s/tools/esp32ulp-elf/%s/esp32ulp-elf-binutils/bin' %
+        self.assertNotIn('%s/tools/esp32ulp-elf/%s/esp32ulp-elf/bin' %
                          (self.temp_tools_dir, ESP32ULP_VERSION), output)
         self.assertNotIn('%s/tools/xtensa-esp32-elf/%s/xtensa-esp32-elf/bin' %
                          (self.temp_tools_dir, XTENSA_ESP32_ELF_VERSION), output)
-        self.assertNotIn('%s/tools/esp32s2ulp-elf/%s/esp32s2ulp-elf-binutils/bin' %
-                         (self.temp_tools_dir, ESP32S2ULP_VERSION), output)
         self.assertNotIn('%s/tools/xtensa-esp32s2-elf/%s/xtensa-esp32s2-elf/bin' %
                          (self.temp_tools_dir, XTENSA_ESP32S2_ELF_VERSION), output)
         self.assertNotIn('%s/tools/xtensa-esp32s3-elf/%s/xtensa-esp32s3-elf/bin' %
@@ -279,30 +263,26 @@ def test_tools_for_esp32s2(self):
         self.assert_tool_installed(output, XTENSA_ESP32S2_ELF, XTENSA_ESP32S2_ELF_VERSION)
         self.assert_tool_installed(output, OPENOCD, OPENOCD_VERSION)
         self.assert_tool_installed(output, RISCV_ELF, RISCV_ELF_VERSION)
+        self.assert_tool_installed(output, ESP32ULP, ESP32ULP_VERSION)
         self.assert_tool_installed(output, XTENSA_ESP_GDB, XTENSA_ESP_GDB_VERSION)
         self.assert_tool_not_installed(output, RISCV_ESP_GDB, RISCV_ESP_GDB_VERSION)
         self.assert_tool_not_installed(output, XTENSA_ESP32_ELF, XTENSA_ESP32_ELF_VERSION)
         self.assert_tool_not_installed(output, XTENSA_ESP32S3_ELF, XTENSA_ESP32S3_ELF_VERSION)
-        self.assert_tool_not_installed(output, ESP32ULP, ESP32ULP_VERSION, ESP32ULP_ARCHIVE)
-        self.assert_tool_installed(output, ESP32S2ULP, ESP32S2ULP_VERSION, ESP32S2ULP_ARCHIVE)
         self.assertIn('Destination: {}'.format(os.path.join(self.temp_tools_dir, 'dist')), output)
         self.assertEqual(required_tools_installed, output.count('Done'))
 
         output = self.run_idf_tools_with_action(['check'])
-        self.assertIn('version installed in tools directory: ' + ESP32S2ULP_VERSION, output)
         self.assertIn('version installed in tools directory: ' + OPENOCD_VERSION, output)
         self.assertIn('version installed in tools directory: ' + XTENSA_ESP32S2_ELF_VERSION, output)
         self.assertIn('version installed in tools directory: ' + XTENSA_ESP_GDB_VERSION, output)
 
         output = self.run_idf_tools_with_action(['export'])
-        self.assertIn('%s/tools/esp32s2ulp-elf/%s/esp32s2ulp-elf-binutils/bin' %
-                      (self.temp_tools_dir, ESP32S2ULP_VERSION), output)
         self.assertIn('%s/tools/xtensa-esp32s2-elf/%s/xtensa-esp32s2-elf/bin' %
                       (self.temp_tools_dir, XTENSA_ESP32S2_ELF_VERSION), output)
         self.assertIn('%s/tools/openocd-esp32/%s/openocd-esp32/bin' %
                       (self.temp_tools_dir, OPENOCD_VERSION), output)
-        self.assertNotIn('%s/tools/esp32ulp-elf/%s/esp32ulp-elf-binutils/bin' %
-                         (self.temp_tools_dir, ESP32ULP_VERSION), output)
+        self.assertIn('%s/tools/esp32ulp-elf/%s/esp32ulp-elf/bin' %
+                      (self.temp_tools_dir, ESP32ULP_VERSION), output)
         self.assertNotIn('%s/tools/xtensa-esp32-elf/%s/xtensa-esp32-elf/bin' %
                          (self.temp_tools_dir, XTENSA_ESP32_ELF_VERSION), output)
         self.assertIn('%s/tools/riscv32-esp-elf/%s/riscv32-esp-elf/bin' %
@@ -320,12 +300,11 @@ def test_tools_for_esp32s3(self):
         self.assert_tool_installed(output, XTENSA_ESP32S3_ELF, XTENSA_ESP32S3_ELF_VERSION)
         self.assert_tool_installed(output, OPENOCD, OPENOCD_VERSION)
         self.assert_tool_installed(output, RISCV_ELF, RISCV_ELF_VERSION)
+        self.assert_tool_installed(output, ESP32ULP, ESP32ULP_VERSION)
         self.assert_tool_installed(output, XTENSA_ESP_GDB, XTENSA_ESP_GDB_VERSION)
         self.assert_tool_not_installed(output, RISCV_ESP_GDB, RISCV_ESP_GDB_VERSION)
         self.assert_tool_not_installed(output, XTENSA_ESP32_ELF, XTENSA_ESP32_ELF_VERSION)
         self.assert_tool_not_installed(output, XTENSA_ESP32S2_ELF, XTENSA_ESP32S2_ELF_VERSION)
-        self.assert_tool_not_installed(output, ESP32ULP, ESP32ULP_VERSION, ESP32ULP_ARCHIVE)
-        self.assert_tool_installed(output, ESP32S2ULP, ESP32S2ULP_VERSION, ESP32S2ULP_ARCHIVE)
         self.assertIn('Destination: {}'.format(os.path.join(self.temp_tools_dir, 'dist')), output)
         self.assertEqual(required_tools_installed, output.count('Done'))
 
@@ -340,14 +319,12 @@ def test_tools_for_esp32s3(self):
                       (self.temp_tools_dir, OPENOCD_VERSION), output)
         self.assertIn('%s/tools/xtensa-esp32s3-elf/%s/xtensa-esp32s3-elf/bin' %
                       (self.temp_tools_dir, XTENSA_ESP32S3_ELF_VERSION), output)
-        self.assertNotIn('%s/tools/esp32ulp-elf/%s/esp32ulp-elf-binutils/bin' %
-                         (self.temp_tools_dir, ESP32ULP_VERSION), output)
+        self.assertIn('%s/tools/esp32ulp-elf/%s/esp32ulp-elf/bin' %
+                      (self.temp_tools_dir, ESP32ULP_VERSION), output)
         self.assertNotIn('%s/tools/xtensa-esp32-elf/%s/xtensa-esp32-elf/bin' %
                          (self.temp_tools_dir, XTENSA_ESP32_ELF_VERSION), output)
         self.assertIn('%s/tools/riscv32-esp-elf/%s/riscv32-esp-elf/bin' %
                       (self.temp_tools_dir, RISCV_ELF_VERSION), output)
-        self.assertIn('%s/tools/esp32s2ulp-elf/%s/esp32s2ulp-elf-binutils/bin' %
-                      (self.temp_tools_dir, ESP32S2ULP_VERSION), output)
         self.assertNotIn('%s/tools/xtensa-esp32s2-elf/%s/xtensa-esp32s2-elf/bin' %
                          (self.temp_tools_dir, XTENSA_ESP32S2_ELF_VERSION), output)
         self.assertIn('%s/tools/xtensa-esp-elf-gdb/%s/xtensa-esp-elf-gdb/bin' %