[cmake][sc-memory] Support arm64 on OSX

Author: deniskoronchik

CMakeLists.txt

@@ -2,22 +2,34 @@ project (sc-machine)
 site_name (www.ostis.net)
 cmake_minimum_required (VERSION 2.8)
 
-include(CTest)
+include (CTest)
+include (CheckCCompilerFlag)
 
-set(SC_BIN_PATH "${CMAKE_CURRENT_LIST_DIR}/bin")
+set (SC_BIN_PATH "${CMAKE_CURRENT_LIST_DIR}/bin")
 
-set(SC_MACHINE_ROOT ${CMAKE_CURRENT_LIST_DIR})
-set(SC_MACHINE_THIRDPARTY_PATH "${SC_MACHINE_ROOT}/thirdparty")
+set (SC_MACHINE_ROOT ${CMAKE_CURRENT_LIST_DIR})
+set (SC_MACHINE_THIRDPARTY_PATH "${SC_MACHINE_ROOT}/thirdparty")
 
 option (SC_AUTO_TEST "Flag to build for automation testing" OFF)
 option (SC_KPM_SCP "Flag to build SCP module" OFF)
 option (SC_BUILD_SCTP "Flag to turn on/off sctp protocol support" OFF)
+option (SC_BUILD_ARM64 "Flag to build arm64" OFF)
 
 set(SC_USE_SANITIZER "none" CACHE STRING "Build with specified sanitizer")
 set_property(CACHE SC_USE_SANITIZER PROPERTY STRINGS none address memory)
 
 message ("Sanitizer: ${SC_USE_SANITIZER}")
 
+if (${SC_BUILD_ARM64})
+    check_c_compiler_flag("-arch arm64" IS_ARM64_SUPPORTED)
+    if (${IS_ARM64_SUPPORTED})
+        set (CMAKE_OSX_ARCHITECTURES "arm64" CACHE STRING "Used architecture" FORCE)
+        message ("-- Architecture: arm64")
+    else()
+        message (FATAL_ERROR "Arm64 platform is not supported by compiler")
+    endif()
+endif()
+
 # codegen
 if (${UNIX})
     set(SC_CODEGEN_TOOL "${SC_BIN_PATH}/sc-code-generator")
@@ -91,7 +103,6 @@ if (${APPLE})
 
     set (GLIB2_LIBRARIES ${GLIB_LDFLAGS} ${GLIB2_MODULE_LDFLAGS})
 
-    set (LIBCLANG_LLVM_CONFIG_EXECUTABLE "/usr/local/opt/llvm/bin/llvm-config")
     if (NOT DEFINED LIBCLANG_LIBRARIES OR NOT DEFINED LIBCLANG_CXXFLAGS OR NOT DEFINED LIBCLANG_LIBDIR)
         find_package(LibClang REQUIRED)
     endif ()

cmake/FindLibClang.cmake

@@ -48,6 +48,7 @@ if (NOT LIBCLANG_LLVM_CONFIG_EXECUTABLE)
         set(llvm_config_names llvm-config)
         foreach(minor RANGE 9 0)
             list(APPEND llvm_config_names 
+                "llvm-config"
                 "llvm-config-7"
                 "llvm-config-6.${minor}"
                 "llvm-config-5.${minor}"

sc-memory/sc-core/sc-store/sc_element.h

@@ -21,7 +21,7 @@ struct _sc_arc_info
 };
 
 
-#define SC_CHECKSUM_LEN 32//(sizeof(sc_arc_info) - sizeof(sc_uint32))
+#define SC_CHECKSUM_LEN 32 //(sizeof(sc_arc_info) - sizeof(sc_uint32))
 
 /*! Structure to store content information
  * Data field store checksum for data, that stores in specified sc-link.

sc-memory/sc-core/sc-store/sc_event/sc_event_private.h

@@ -20,7 +20,6 @@
 #define SC_EVENT_REQUEST_DESTROY  (1 << 31)
 #define SC_EVENT_REF_COUNT_MASK (~SC_EVENT_REQUEST_DESTROY)
 
-#pragma pack(push, 1)
 /*! Structure that contains information about event
  */
 struct _sc_event
@@ -45,7 +44,6 @@ struct _sc_event
   sc_access_levels access_levels;
 
 };
-#pragma pack(pop)
 
 
 //! Function to initialize sc-events module

sc-memory/sc-core/sc-store/sc_event/sc_event_queue.c

@@ -11,14 +11,12 @@
 #include "../../sc_memory_private.h"
 #include "../../sc_memory.h"
 
-#pragma pack(push, 1)
 typedef struct
 {
   sc_event * evt;
   sc_addr edge_addr;
   sc_addr other_addr;
 } sc_event_pool_worker_data;
-#pragma pack(pop)
 
 sc_event_pool_worker_data * sc_event_pool_worker_data_new(sc_event * evt, sc_addr edge_addr, sc_addr other_addr)
 {

sc-memory/tests/sc-memory/performance/main.cpp

@@ -52,6 +52,11 @@ void BM_MemoryThreaded(benchmark::State & state)
 
 int constexpr kNodeIters = 10000000;
 
+BENCHMARK_TEMPLATE(BM_MemoryThreaded, TestCreateNode)
+    ->Threads(1)
+    ->Iterations(kNodeIters)
+    ->Unit(benchmark::TimeUnit::kMicrosecond);
+
 BENCHMARK_TEMPLATE(BM_MemoryThreaded, TestCreateNode)
   ->Threads(2)
   ->Iterations(kNodeIters / 2)
@@ -72,7 +77,12 @@ BENCHMARK_TEMPLATE(BM_MemoryThreaded, TestCreateNode)
   ->Iterations(kNodeIters / 16)
   ->Unit(benchmark::TimeUnit::kMicrosecond);
 
-int constexpr kLinkIters = 25000;
+int constexpr kLinkIters = 2500;
+
+BENCHMARK_TEMPLATE(BM_MemoryThreaded, TestCreateLink)
+    ->Threads(1)
+    ->Iterations(kLinkIters)
+    ->Unit(benchmark::TimeUnit::kMicrosecond);
 
 BENCHMARK_TEMPLATE(BM_MemoryThreaded, TestCreateLink)
   ->Threads(2)

sc-network/sctp_client/sctpClient.hpp

@@ -20,7 +20,6 @@ namespace sctp
 
 #define SCTP_ADDR_SIZE      (sizeof(ScRealAddr))
 
-#pragma pack(push,1)
 struct RequestHeader
 {
   sc_uint8 commandType;
@@ -76,8 +75,6 @@ struct ResultHeader
 };
 
 
-#pragma pack(pop)
-
 class Iterator
 {
   friend class Client;