modifying and adding files adapter for esp32

Author: eiSouthBoy

CMakeLists.txt

@@ -0,0 +1,11 @@
+idf_component_register(SRCS 
+                            "core_list_join.c"
+                            "core_main.c"
+                            "core_matrix.c"
+                            "core_state.c"
+                            "core_util.c"
+                            "posix/core_portme.c"
+                       INCLUDE_DIRS 
+                            "."
+                            "posix")
+target_compile_options(${COMPONENT_LIB} PRIVATE ${CONFIG_OPTIMIZATION})

Kconfig.projbuild

@@ -0,0 +1,69 @@
+menu "Example CoreMark Configuration"
+
+    # 编译优化等级参数
+    choice COMPILER_FLAGS
+        prompt "Compiler optimisation"
+        default O3
+        help 
+            Compiler optimization. For best CoreMark result select Turn on all.
+            Pratically this is a choice between -O3 and -O0.
+
+    config O3
+        bool "Turn on all(O3)"
+        help 
+            Compile Coremark with -O3
+    config O0
+        bool "Turn off all(O0)"
+        help 
+            Compile Coremark with -O0
+        
+    endchoice
+
+    # 迭代次数
+    config ITERATIONS
+        int "Number of iterations"
+        default 5000
+        range 5000 50000
+        help
+            Select a number of iteration which enable the test to run for 
+            more than 10s.
+
+    # 启动核心数（单核 或 多核）
+    config MULTI_THREADS    	
+        bool "Multi-Threads"
+        default n
+        help
+            Select the number of tasks to run in parallel.
+            if you want to use multi-thread, you can select
+            yes.
+    
+    # CPU频率
+    choice CPU_FREQUENCY
+        prompt "cpu frequency"
+        default ESP_DEFAULT_CPU_FREQ_MHZ_240
+        help
+          cpu frequency, 80MHz, 160MHz, 240MHz
+
+        config ESP_DEFAULT_CPU_FREQ_MHZ_80
+        bool "80MHz"
+        help
+          80MHz
+
+        config ESP_DEFAULT_CPU_FREQ_MHZ_160
+        bool "160MHz"
+        help
+          160MHz
+        
+        config ESP_DEFAULT_CPU_FREQ_MHZ_240
+        bool "240MHz"
+        help
+          240MHz
+
+    endchoice
+        
+    config OPTIMIZATION
+        string
+        default "-O3" if O3
+        default "-O0" if O0
+
+endmenu

posix/core_portme.c

@@ -23,6 +23,10 @@ Original Author: Shay Gal-on
 #include <valgrind/callgrind.h>
 #endif
 
+#if (MULTITHREAD > 1)
+static EventGroupHandle_t task_iterate_event_group;
+#endif
+
 #if (MEM_METHOD == MEM_MALLOC)
 /* Function: portable_malloc
         Provide malloc() functionality in a platform specific way.
@@ -216,6 +220,18 @@ portable_init(core_portable *p, int *argc, char *argv[])
     }
 #endif
 
+#if (SEED_METHOD == SEED_VOLATILE)
+#if VALIDATION_RUN
+    ee_printf("--> VALIDATION_RUN\n");
+#endif
+#if PERFORMANCE_RUN
+    ee_printf("--> PERFORMANCE_RUN\n");
+#endif
+#if PROFILE_RUN
+    ee_printf("--> PROFILE_RUN\n");
+#endif
+#endif
+
     (void)argc; // prevent unused warning
     (void)argv; // prevent unused warning
 
@@ -234,6 +250,10 @@ portable_init(core_portable *p, int *argc, char *argv[])
         "ERROR! Main has no argc, but SEED_METHOD defined to SEED_ARG!\n");
 #endif
 
+#if (MULTITHREAD > 1)
+    task_iterate_event_group = xEventGroupCreate();
+#endif
+
 #if (MULTITHREAD > 1) && (SEED_METHOD == SEED_ARG)
     int nargs = *argc, i;
     if ((nargs > 1) && (*argv[1] == 'M'))
@@ -278,18 +298,63 @@ portable_fini(core_portable *p)
    MCAPI or other standards can easily be devised.
 */
 #if USE_PTHREAD
+// ee_u8
+// core_start_parallel(core_results *res)
+// {
+//     return (ee_u8)pthread_create(
+//         &(res->port.thread), NULL, iterate, (void *)res);
+// }
+// ee_u8
+// core_stop_parallel(core_results *res)
+// {
+//     void *retval;
+//     return (ee_u8)pthread_join(res->port.thread, &retval);
+// }
+
+
+void iterate_task(void *param)
+{
+    core_results *res = (core_results *)param;
+    
+    iterate(res);
+
+    xEventGroupSetBits(*(res->port.event_group), res->port.event_bit);
+
+    vTaskDelete(NULL);
+}
+
+#define SIZE_NAME 16
+
 ee_u8
 core_start_parallel(core_results *res)
 {
-    return (ee_u8)pthread_create(
-        &(res->port.thread), NULL, iterate, (void *)res);
+    static BaseType_t core = 0;
+    char name[SIZE_NAME + 1] = {0};
+
+    snprintf(name, SIZE_NAME, "iterate-%d", core);
+    
+    res->port.event_bit = (1 << core);
+    res->port.event_group = &task_iterate_event_group;
+
+    xTaskCreatePinnedToCore(iterate_task, name, 8192, res, 1, NULL, core);
+
+    core += 1;
+
+    return 1;
 }
+
 ee_u8
 core_stop_parallel(core_results *res)
 {
-    void *retval;
-    return (ee_u8)pthread_join(res->port.thread, &retval);
+    xEventGroupWaitBits(*(res->port.event_group), 
+                        res->port.event_bit, 
+                        false, 
+                        false, 
+                        120000 / portTICK_PERIOD_MS);
+
+    return 1;
 }
+
 #elif USE_FORK
 static int key_id = 0;
 ee_u8

posix/core_portme.h

@@ -24,6 +24,24 @@ Original Author: Shay Gal-on
 #define CORE_PORTME_H
 
 #include "core_portme_posix_overrides.h"
+#include "../../../build/config/sdkconfig.h"
+#define COMPILER_FLAGS  CONFIG_OPTIMIZATION   // 编译优化等级
+
+#ifdef CONFIG_MULTI_THREADS
+#define MULTITHREAD     2
+#define USE_PTHREAD     1
+#endif
+
+#define MAIN_HAS_NOARGC 1
+
+#define ITERATIONS      CONFIG_ITERATIONS
+#define SEED_METHOD     SEED_VOLATILE
+
+#if (MULTITHREAD > 1)
+#include "freertos/FreeRTOS.h"
+#include "freertos/task.h"
+#include "freertos/event_groups.h"
+#endif
 
 /************************/
 /* Data types and settings */
@@ -284,6 +302,11 @@ typedef struct CORE_PORTABLE_S
 #if (MULTITHREAD > 1)
 #if USE_PTHREAD
     pthread_t thread;
+
+    TaskHandle_t handle;
+    ee_u32 event_bit;
+    EventGroupHandle_t *event_group;
+
 #elif USE_FORK
     pid_t pid;
     int   shmid;