update

Unam3dd · Jun 1, 2024 · 947635c · 947635c
1 parent b3cbba9
commit 947635c
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 133 deletions.
diff --git a/Taskfile.yml b/Taskfile.yml
@@ -15,7 +15,7 @@ tasks:
       - sh: '{{if eq OS "windows"}} powershell.exe -Command Test-Path dist {{else}} test ! -d dist {{end}}'
         msg: "Nothing to be done."
     cmds:
-      - meson setup build --buildtype=release --prefix=$(pwd)
+      - meson setup build --prefix=$(pwd)
       - ninja -C build install
     silent: true
     desc: "Build the project in release build"
@@ -25,7 +25,7 @@ tasks:
       - sh: '{{if eq OS "windows"}} powershell.exe -Command Test-Path dist {{else}} test ! -d dist {{end}}'
         msg: "Nothing to be done."
     cmds:
-      - meson setup build --buildtype=release --strip --prefix=$(pwd)
+      - meson setup build --strip --prefix=$(pwd)
       - ninja -C build install
     silent: true
     desc: "Build the project in release build in stripped mode"
@@ -35,7 +35,7 @@ tasks:
       - sh: '{{if eq OS "windows"}} powershell.exe -Command Test-Path dist {{else}} test ! -d dist {{end}}'
         msg: "Nothing to be done."
     cmds:
-      - meson setup build --buildtype=debug --prefix=$(pwd)
+      - meson setup build --buildtype=debugoptmized --prefix=$(pwd)
       - ninja -C build install
     silent: true
     desc: "Build the project in dev build"
@@ -45,7 +45,7 @@ tasks:
       - sh: '{{if eq OS "windows"}} powershell.exe -Command Test-Path dist {{else}} test ! -d dist {{end}}'
         msg: "Nothing to be done."
     cmds:
-      - meson setup --cross {{.CLI_ARGS}} build --buildtype=release --prefix=$(pwd)
+      - meson setup --cross {{.CLI_ARGS}} build --prefix=$(pwd)
       - ninja -C build install
     silent: true
     desc: "Build the project with the compiler of your choice in release mode"
@@ -55,55 +55,39 @@ tasks:
       - sh: '{{if eq OS "windows"}} powershell.exe -Command Test-Path dist {{else}} test ! -d dist {{end}}'
         msg: "Nothing to be done."
     cmds:
-      - meson setup --cross {{.CLI_ARGS}} build --buildtype=debug --prefix=$(pwd)
+      - meson setup --cross {{.CLI_ARGS}} build --buildtype=debugoptimized --prefix=$(pwd)
       - ninja -C build install
     silent: true
     desc: "Build the project with the compiler of your choice in dev mode"
 
   re:
     cmds:
-      - meson setup build --reconfigure --buildtype=release --prefix=$(pwd)
+      - meson setup build --reconfigure --prefix=$(pwd)
       - ninja -C build install
     silent: true
     desc: "Re build the project"
 
   re-dev:
     cmds:
-      - meson setup build --reconfigure --buildtype=debug --prefix=$(pwd)
+      - meson setup build --reconfigure --buildtype=debugoptimized --prefix=$(pwd)
       - ninja -C build install
     silent: true
     desc: "Re build the project in dev mode"
 
   re-strip:
     cmds:
-      - meson setup build --reconfigure --buildtype=release --strip --prefix=$(pwd)
+      - meson setup build --reconfigure --strip --prefix=$(pwd)
       - ninja -C build install
     silent: true
     desc: "Re build the project with strip"
 
   build-tests:
     cmds:
-      - meson setup build --reconfigure -Dbuild_tests=true -Dno_static=true --buildtype=release --prefix=$(pwd)
+      - meson setup build --reconfigure -Dbuild_tests=true -Dno_static=true --prefix=$(pwd)
       - ninja -C build
     silent: true
     desc: "Build tests files"
 
-  build-bench:
-    cmds:
-      - meson setup build --reconfigure -Dbuild_tests=true -Dbuild_bench=true -Dno_static=true --buildtype=release --prefix=$(pwd)
-      - ninja -C build
-    silent: true
-    desc: "Build benchmarks files"
-
-  run-bench:
-    preconditions:
-      - sh: '{{if eq OS "windows" }} powershell.exe -Command Test-Path build {{else}} test -d build {{end}}'
-        msg: "Build directory not exist please run build_tests before"
-    cmds:
-      - meson test --benchmark -C build
-    silent: true
-    desc: "Run benchmarks files"
-
   run-tests:
     preconditions:
       - sh: '{{if eq OS "windows" }} powershell.exe -Command Test-Path build {{else}} test -d build {{end}}'

diff --git a/benchmarks/memory/memcpy_naive/memcpy_naive.c b/benchmarks/memory/memcpy_naive/memcpy_naive.c
diff --git a/inc/eth-memory.h b/inc/eth-memory.h
@@ -1,6 +1,14 @@
 #ifndef ETH_MEMORY_H
 #define ETH_MEMORY_H
 
+///////////////////////////////////////
+//
+//         HEADER
+//
+//////////////////////////////////////
+
+#include "eth-types.h"
+
 ///////////////////////////////////////
 //
 //        MEMORY

diff --git a/inc/eth-types.h b/inc/eth-types.h
@@ -11,6 +11,18 @@
 #define ETH_NULL (void*)0
 #endif
 
+///////////////////////////////////////
+//
+//          STATIC
+//
+//////////////////////////////////////
+
+#ifndef NO_STATIC
+#define STATIC static
+#else
+#define STATIC
+#endif
+
 ///////////////////////////////////////
 //
 //       TYPEDEFS SIGNED LEGACY

diff --git a/meson.build b/meson.build
@@ -1,6 +1,6 @@
 project('Etheria-std', 'c',
   version : '0.1',
-  default_options : ['warning_level=3', 'werror=true', 'optimization=3'])
+  default_options : ['warning_level=3', 'werror=true', 'optimization=3', 'buildtype=release'])
 
 
 ######################################
@@ -26,7 +26,7 @@ endif
 #
 ######################################
 
-criterion_dep = dependency('criterion', required: false)
+criterion_dep = dependency('criterion', required: false, allow_fallback: true)
 
 ######################################
 #           
@@ -71,16 +71,6 @@ memory_memcpy_naive = files('tests/memory/memcpy/memcpy_naive/memcpy_naive.c',
 
 tests = types_tests + memory_memcpy_naive
 
-######################################
-#           
-#
-#           BENCHMARKS
-#
-#
-######################################
-
-benchmarks = files('./benchmarks/memory/memcpy_naive/memcpy_naive.c')
-
 summary({
   'CPU': build_machine.cpu(),
   'Endian': build_machine.endian(),
@@ -124,14 +114,14 @@ if host_machine.system() == 'windows'
 else
   lib_shared = shared_library('etheria-std',
               srcs,
-              c_args: ['-nostdlib', '-nodefaultlibs', '-Oz', '-fPIC'],
+              c_args: ['-nostdlib', '-nodefaultlibs', '-Os', '-fPIC'],
               install: true,
               install_dir: 'dist/shared',
               include_directories: incdir)
 
   lib_static = static_library('etheria-std',
     srcs,
-    c_args: ['-nostdlib', '-nodefaultlibs', '-Oz'],
+    c_args: ['-nostdlib', '-nodefaultlibs', '-Os'],
     install: true,
     install_dir: 'dist/static',
     include_directories: incdir)
@@ -143,32 +133,12 @@ foreach test_file : tests
   test_name = 'test_' + test_file.full_path().split('/')[-1].split('.c')[0]
   test_exec = executable(test_name,
     test_file,
-    c_args: ['-g3', '-Oz', '-fPIC'],
+    c_args: ['-g3', '-Os', '-fPIC'],
     dependencies: [criterion_dep],
     link_with: lib_static,
     include_directories: incdir,
     install: false,
     pie: true)
-  test(test_name, test_exec, verbose: true)
+  test(test_name, test_exec, verbose: false)
 endforeach
-
-if get_option('build_bench') and host_machine.system() == 'linux'
-foreach bench_file: benchmarks
-  bench_name = 'bench_' + bench_file.full_path().split('/')[-1].split('.c')[0]
-
-  bench_exec = executable(bench_name, bench_file, 
-    c_args: ['-Oz', '-fPIC'],
-    link_with: lib_static,
-    include_directories: incdir,
-    install: true,
-    install_dir: 'benchmarks/output/',
-    pie: true)
-
-  benchmark(bench_name, bench_exec, args: ['--stack', 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'], verbose: true)
-  benchmark(bench_name, bench_exec, args: ['--stack', 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'], verbose: true)
-  benchmark(bench_name, bench_exec, args: ['--stack', 'HELLO'], verbose: true)
-  benchmark(bench_name, bench_exec, args: ['--stack', 'PWDPWD'], verbose: true)
-endforeach
-endif
-
 endif
diff --git a/src/memory/memcpy/memcpy.c b/src/memory/memcpy/memcpy.c
@@ -1,4 +1,4 @@
-#include "eth-std.h"
+#include "eth-types.h"
 
 ///////////////////////////////////////
 //
@@ -8,8 +8,7 @@
 
 #if defined(__linux__)
 
-#ifdef NO_STATIC
-void *_eth_memcpy_naive (void *restrict dst, const void *restrict src, size_t size)
+STATIC void *_eth_memcpy_naive (void *restrict dst, const void *restrict src, size_t size)
 {
   if (!dst || !src || !size)
     return (dst);
@@ -20,19 +19,6 @@ void *_eth_memcpy_naive (void *restrict dst, const void *restrict src, size_t si
   while (size--) *pd++ = *ps++;
   return (dst);
 }
-#else
-static void *_eth_memcpy_naive (void *restrict dst, const void *restrict src, size_t size)
-{
-  if (!dst || !src || !size)
-    return (dst);
-
-  u8_t *ps = (u8_t *) src;
-  u8_t *pd = (u8_t *) dst;
-
-  while (size--) *pd++ = *ps++;
-  return (dst);
-}
-#endif
 
 void *(*_eth_memcpy_ifunc (void)) (void *restrict, const void *restrict, size_t)
 {

diff --git a/subprojects/criterion.wrap b/subprojects/criterion.wrap
@@ -2,7 +2,7 @@
 url = https://github.com/Snaipe/Criterion.git
 depth = 1
 revision = head
-method = cmake
+method = meson
 
 [provide]
 dependency_names = criterion