Add SwiftCorelibsCoreFoundation, Utilities targets and UtilitiesTests (#203)

Author: Kyle-Ye

CREDITS.md

@@ -7,6 +7,7 @@ This project uses third-party libraries and code. Their licenses and acknowledge
 ## Compute
 
 OpenAttributeGraphCxx's Data, Graph, Vector and more is modified based on [Compute](https://github.com/jcmosc/Compute)'s implementations.
+Platform, SwiftCorelibsCoreFoundation and Utilities are also modified based on Compute's implementations.
 
 Compute is licensed as follows:
 

Package.resolved

@@ -163,11 +163,17 @@ let attributeGraphCondition = envBoolValue("ATTRIBUTEGRAPH", default: buildForDa
 var sharedCSettings: [CSetting] = [
     .unsafeFlags(["-I", libSwiftPath], .when(platforms: .nonDarwinPlatforms)),
     .define("NDEBUG", .when(configuration: .release)),
+    // Rewrite malloc() to malloc_type_malloc() for type-isolated allocation buckets (xzone malloc).
+    .unsafeFlags(["-ftyped-memory-operations"], .when(platforms: .darwinPlatforms)),
 ]
 
 var sharedCxxSettings: [CXXSetting] = [
     .unsafeFlags(["-I", libSwiftPath], .when(platforms: .nonDarwinPlatforms)),
     .define("NDEBUG", .when(configuration: .release)),
+    // Rewrite malloc() to malloc_type_malloc() for type-isolated allocation buckets (xzone malloc).
+    .unsafeFlags(["-ftyped-memory-operations"], .when(platforms: .darwinPlatforms)),
+    // Rewrite operator new/delete to typed variants (operator new(size_t, std::__type_descriptor_t)).
+    .unsafeFlags(["-ftyped-cxx-new-delete"], .when(platforms: .darwinPlatforms)),
 ]
 
 var sharedSwiftSettings: [SwiftSetting] = [
@@ -226,6 +232,9 @@ extension Target {
 }
 
 extension [Platform] {
+    static var darwinPlatforms: [Platform] {
+        [.macOS, .iOS, .tvOS, .watchOS, .visionOS, .macCatalyst]
+    }
     static var nonDarwinPlatforms: [Platform] {
         [.linux, .android, .wasi, .openbsd, .windows]
     }
@@ -242,16 +251,30 @@ let swiftClonePlugin = Target.plugin(
 
 let platformTarget = Target.target(
     name: "Platform",
-    cSettings: [
+    cSettings: sharedCSettings + [
         .define("_GNU_SOURCE", .when(platforms: [.linux])),
     ]
 )
+let swiftCorelibsCoreFoundationTarget = Target.target(
+    name: "SwiftCorelibsCoreFoundation"
+)
+let utilitiesTarget = Target.target(
+    name: "Utilities",
+    dependencies: [
+        .target(name: platformTarget.name),
+        .target(name: swiftCorelibsCoreFoundationTarget.name, condition: .when(platforms: .nonDarwinPlatforms)),
+    ],
+    cxxSettings: sharedCxxSettings
+)
 // FIXME: Merge into one target
 // OpenAttributeGraph is a C++ & Swift mix target.
 // The SwiftPM support for such usage is still in progress.
 let openAttributeGraphCxxTarget = Target.target(
     name: "OpenAttributeGraphCxx",
-    dependencies: [.target(name: platformTarget.name)],
+    dependencies: [
+        .target(name: platformTarget.name),
+        .target(name: utilitiesTarget.name),
+    ],
     cSettings: sharedCSettings + [
         .define("__COREFOUNDATION_FORSWIFTFOUNDATIONONLY__", to: "1", .when(platforms: .nonDarwinPlatforms)),
     ],
@@ -279,6 +302,14 @@ let openAttributeGraphShimsTarget = Target.target(
 
 // MARK: - Test Targets
 
+let utilitiesTestsTarget = Target.testTarget(
+    name: "UtilitiesTests",
+    dependencies: [
+        .target(name: utilitiesTarget.name),
+    ],
+    cxxSettings: [.define("SWIFT_TESTING")],
+    swiftSettings: [.interoperabilityMode(.Cxx)]
+)
 let openAttributeGraphCxxTestsTarget = Target.testTarget(
     name: "OpenAttributeGraphCxxTests",
     dependencies: [
@@ -324,6 +355,8 @@ let package = Package(
     targets: [
         swiftClonePlugin,
         platformTarget,
+        swiftCorelibsCoreFoundationTarget,
+        utilitiesTarget,
         openAttributeGraphTarget,
         openAttributeGraphCxxTarget,
         openAttributeGraphShimsTarget,
@@ -335,6 +368,7 @@ if compatibilityTestCondition {
     openAttributeGraphCompatibilityTestsTarget.addAGSettings()
 } else {
     package.targets += [
+        utilitiesTestsTarget,
         openAttributeGraphCxxTestsTarget,
         openAttributeGraphShimsTestsTarget,
     ]

Package.swift

@@ -4,7 +4,6 @@
 //
 //  Audited for 6.5.1
 //  Status: WIP
-//  Modified based Compute code
 
 #include <OpenAttributeGraphCxx/Data/table.hpp>
 #include <OpenAttributeGraphCxx/Data/page.hpp>

Sources/OpenAttributeGraphCxx/Data/table.cpp

@@ -208,12 +208,7 @@ void OAGTupleWithBuffer(OAGTupleType tuple_type, size_t count, const void (* fun
         // So we need to call function in this scope.
         function(tuple, context);
     } else {
-        #if OAG_TARGET_OS_DARWIN
-        void *buffer = malloc_type_malloc(buffer_size, 0x100004077774924);
-        #else
-        // FIXME
         void *buffer = malloc(buffer_size);
-        #endif
         if (buffer == nullptr) {
             OAG::precondition_failure("memory allocation failure");
         }

Sources/OpenAttributeGraphCxx/Runtime/OAGTupleType.cpp

@@ -3,7 +3,6 @@
 //  OpenAttributeGraphCxx
 //
 //  Status: Complete
-//  Modified based Compute code
 
 #ifndef ptr_hpp
 #define ptr_hpp

Sources/OpenAttributeGraphCxx/include/OpenAttributeGraphCxx/Data/ptr.hpp

@@ -44,13 +44,6 @@ module OpenAttributeGraphCxx_Private.Runtime {
     export *
 }
 
-module OpenAttributeGraphCxx_Private.Util {
-    requires cplusplus
-    umbrella "OpenAttributeGraphCxx/Util"
-    export *
-    module * { export * }
-}
-
 module OpenAttributeGraphCxx_Private.Vector {
     requires cplusplus
     umbrella "OpenAttributeGraphCxx/Vector"

Sources/OpenAttributeGraphCxx/include/module.private.modulemap

@@ -0,0 +1,24 @@
+#pragma once
+
+#if __APPLE__
+#include <malloc/malloc.h>
+#else
+
+#include <malloc.h>
+
+typedef int malloc_zone_t;
+
+#define malloc_zone_malloc(zone,size) malloc(size)
+#define malloc_zone_memalign(zone,align,size) malloc(size)
+#define malloc_zone_calloc(zone,count,size) calloc(count,size)
+#define malloc_zone_realloc(zone,ptr,size) realloc(ptr,size)
+#define malloc_zone_free(zone,ptr) free(ptr)
+
+#define malloc_size(ptr) malloc_usable_size(ptr)
+#define malloc_good_size(size) (size)
+
+#define malloc_create_zone(a,b) ((malloc_zone_t *)NULL)
+#define malloc_destroy_zone(zone)
+#define malloc_set_zone_name(zone,name)
+
+#endif

Sources/Platform/LICENSE

@@ -2,3 +2,4 @@
 
 #include <platform/base.h>
 #include <platform/log.h>
+#include <platform/malloc.h>