Include/Hallocy/Allocator.h

@@ -26,7 +26,7 @@
 #include <stddef.h>
 #include <stdbool.h>
 
-#include "../Utils/Error.h"
+#include "Error.h"
 
 void *hallocy_malloc(size_t size);
 HallocyError hallocy_free(void *pointer);

Include/Hallocy/Utils/Simd.h

@@ -1,55 +0,0 @@
-/*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * -----------------------------------------------------------------------------
- * File: Simd.h
- * Description:
- *  This file implements the functions for detecting SIMD support and defines the 
- *  enum for specifing the SIMD type.
- * 
- * Author: Mineplay
- * -----------------------------------------------------------------------------
- */
-#ifndef HALLOCY_SIMD
-#define HALLOCY_SIMD
-
-#if defined(_MSC_VER)
-    #if defined(_M_ARM64)
-    #include <arm64intr.h>
-    #else
-    #include <intrin.h>
-    #endif
-#else
-    #if defined(__aarch64__)
-    #include <arm64intr.h>
-    #elif defined(__arm__)
-    #include <arm_neon.h>
-    #else
-    #include <immintrin.h>
-    #endif
-#endif
-
-typedef enum {
-    HALLOCY_SIMD_UNDEFINED = 0,
-    HALLOCY_SIMD_NONE = 1,
-    HALLOCY_SIMD_SSE = 2,
-    HALLOCY_SIMD_SSE2 = 3,
-    HALLOCY_SIMD_AVX = 4,
-    HALLOCY_SIMD_AVX2 = 5,
-    HALLOCY_SIMD_AVX512 = 6,
-    HALLOCY_SIMD_NEON = 7
-} HallocySimdType;
-
-HallocySimdType hallocy_is_simd_supported();
-
-#endif

Src/Allocator.c

@@ -20,7 +20,7 @@
  * Author: Mineplay
  * -----------------------------------------------------------------------------
  */
-#include "../../Include/Hallocy/Core/Allocator.h"
+#include "../Include/Hallocy/Allocator.h"
 
 #if defined(_WIN32)
 #include <windows.h>

Src/Utils/Simd.c

@@ -1,133 +0,0 @@
-/*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * -----------------------------------------------------------------------------
- * File: Simd.h
- * Description:
- *  This file implements the function for detecting SIMD support.
- * 
- * Author: Mineplay
- * -----------------------------------------------------------------------------
- */
-#include "../../Include/Hallocy/Utils/Simd.h"
-
-static HallocySimdType hallocy_supported_simd = HALLOCY_SIMD_UNDEFINED;
-
-HallocySimdType hallocy_is_simd_supported() {
-    if (hallocy_supported_simd != HALLOCY_SIMD_UNDEFINED) {
-        return hallocy_supported_simd;
-    }
-
-    #if defined(_MSC_VER)
-        #if defined(_M_ARM64)
-        if (isProcessorFeaturePresent(PF_ARM64_SVE)) {
-            hallocy_supported_simd = HALLOCY_SIMD_NEON;
-            return hallocy_supported_simd;
-        }
-        #else
-        int cpu_info[4] = { 0 };
-        __cpuid(cpu_info, 7);
-        if ((cpu_info[1] & (1 << 16)) != 0) {
-            hallocy_supported_simd = HALLOCY_SIMD_AVX512;
-            return hallocy_supported_simd;
-        }
-        
-        if ((cpu_info[1] & (1 << 5)) != 0) {
-            hallocy_supported_simd = HALLOCY_SIMD_AVX2;
-            return hallocy_supported_simd;
-        }
-
-        __cpuid(cpu_info, 1);
-        
-        if ((cpu_info[2] & (1 << 28)) != 0) {
-            hallocy_supported_simd = HALLOCY_SIMD_AVX;
-            return hallocy_supported_simd;
-        }
-
-        if ((cpu_info[3] & (1 << 26)) != 0) {
-            hallocy_supported_simd = HALLOCY_SIMD_SSE2;
-            return hallocy_supported_simd;
-        }
-
-        if ((cpu_info[3] & (1 << 25)) != 0) {
-            hallocy_supported_simd = HALLOCY_SIMD_SSE2;
-            return hallocy_supported_simd;
-        }
-        #endif
-    #else
-        #if defined(__aarch64__) || defined(__arm__)
-        int file_descriptor = open("/proc/cpuinfo", O_READONLY);
-        if (file_descriptor == -1) {
-            return hallocy_supported_simd;
-        }
-
-        char buffer[256];
-        int bytes_read = read(file_descriptor, buffer, sizeof(buffer));
-        while (bytes_read > 0) {
-            for (size_t i = 0; i < bytes_read - 4; i++) {
-                if (buffer[i] == 'n' && buffer[i + 1] == 'e' && buffer[i + 2] == 'o' && buffer[i + 3] == 'n') {
-                    close(file_descriptor);
-
-                    hallocy_supported_simd = HALLOCY_SIMD_NEON;
-                    return hallocy_supported_simd;
-                }
-            }
-
-            bytes_read = read(file_descriptor, buffer, sizeof(buffer));
-        }
-
-        close(file_descriptor);
-        #else
-        unsigned int a, b, c, d;
-        __asm__ __volatile__ (
-            "cpuid"
-            : "=a" (a), "=b" (b), "=c" (c), "=d" (d)
-            : "a" (7)
-        );
-
-        if ((b & (1 << 16)) != 0) {
-            hallocy_supported_simd = HALLOCY_SIMD_AVX512;
-            return hallocy_supported_simd;
-        }
-
-        if ((b & (1 << 5)) != 0) {
-            hallocy_supported_simd = HALLOCY_SIMD_AVX2;
-            return hallocy_supported_simd;
-        }
-
-        __asm__ __volatile__ (
-            "cpuid"
-            : "=a" (a), "=b" (b), "=c" (c), "=d" (d)
-            : "a" (1)
-        );
-
-        if ((c & (1 << 28)) != 0) {
-            hallocy_supported_simd = HALLOCY_SIMD_AVX;
-            return hallocy_supported_simd;
-        }
-
-        if ((c & (1 << 26)) != 0) {
-            hallocy_supported_simd = HALLOCY_SIMD_SSE2;
-            return hallocy_supported_simd;
-        }
-
-        if ((c & (1 << 25)) != 0) {
-            hallocy_supported_simd = HALLOCY_SIMD_SSE;
-            return hallocy_supported_simd;
-        }
-        #endif
-    #endif
-
-    hallocy_supported_simd = HALLOCY_SIMD_NONE;
-    return hallocy_supported_simd;
-}

Tests/Main.c

@@ -20,9 +20,8 @@
  * -----------------------------------------------------------------------------
  */
  #include <stdio.h>
- #include <Hallocy/Core/Allocator.h>
+ #include <Hallocy/Allocator.h>
- #include <Hallocy/Utils/Simd.h>
+ 
-
  int main() {
      char *memory = (char *)hallocy_malloc(12288);
      if (memory == NULL) {
@@ -41,7 +40,5 @@
          return -1;
      }
  
-     printf("Supported simd version: %d\n", hallocy_is_simd_supported());
-
      return 0;
  }