Skip to content

feat: add aarch for ios arm #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pollend wants to merge 1 commit into
base: main
Choose a base branch
from
+193,084 −48
Open

feat: add aarch for ios arm #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
102 changes: 55 additions & 47 deletions build.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,30 @@
const std = @import("std");
const config = @import("./config.zig");

pub fn build(b: *std.Build) void {
const target = b.standardTargetOptions(.{});
const optimize = b.standardOptimizeOption(.{});

const upstream = b.dependency("openssl", .{});

// Using the package manager, this artifact can be obtained by the user
// through `b.dependency(<name in build.zig.zon>, .{}).artifact("vulkan-zig-generator")`.
// with that, the user need only `.addArg("path/to/vk.xml")`, and then obtain
// a file source to the generated code with `.addOutputArg("vk.zig")`
const generator_exe = b.addExecutable(.{
.name = "generate-asm",
.root_module = b.createModule(.{
.root_source_file = b.path("generate.zig"),
.target = target,
.optimize = optimize,
}),
});
const run_step = b.step("gen", "generate asm assembly");
const run_cmd = b.addRunArtifact(generator_exe);
run_cmd.addFileArg(upstream.path(""));
b.installArtifact(generator_exe);
run_step.dependOn(&run_cmd.step);

const mod = b.createModule(.{
.target = target,
.optimize = optimize,
Expand Down Expand Up @@ -372,6 +391,24 @@ pub fn build(b: *std.Build) void {
.flags = &base_flags,
});

switch (target.result.cpu.arch) {
.x86_64 => mod.addCSourceFiles(.{
.root = upstream.path("crypto"),
.files = &.{
"bn/asm/x86_64-gcc.c"
} }),
else => {},
}

switch (target.result.os.tag) {
.linux => mod.addCSourceFiles(.{
.root = upstream.path("crypto"),
.files = &.{
"loongarchcap.c",
} }),
else => {},
}

mod.addCSourceFiles(.{
.root = upstream.path("crypto"),
.files = &.{
Expand Down Expand Up @@ -496,7 +533,6 @@ pub fn build(b: *std.Build) void {
"bio/bss_null.c",
"bio/bss_sock.c",
"bio/ossl_core_bio.c",
"bn/asm/x86_64-gcc.c",
"bn/bn_add.c",
"bn/bn_asm.c",
"bn/bn_blind.c",
Expand Down Expand Up @@ -878,7 +914,6 @@ pub fn build(b: *std.Build) void {
"kdf/kdf_err.c",
"lhash/lh_stats.c",
"lhash/lhash.c",
"loongarchcap.c",
//"md2/md2_dgst.c",
//"md2/md2_one.c",
"md4/md4_dgst.c",
Expand Down Expand Up @@ -1189,51 +1224,24 @@ pub fn build(b: *std.Build) void {
.flags = &crypto_flags,
});

switch (target.result.cpu.arch) {
.x86_64 => mod.addCSourceFiles(.{
.root = b.path("crypto"),
.files = &.{
"aes/aes-x86_64.s",
"aes/aesni-mb-x86_64.s",
"aes/aesni-sha1-x86_64.s",
"aes/aesni-sha256-x86_64.s",
"aes/aesni-x86_64.s",
"aes/bsaes-x86_64.s",
"aes/vpaes-x86_64.s",
"bn/rsaz-x86_64.s",
"camellia/cmll-x86_64.s",
"chacha/chacha-x86_64.s",
"ec/ecp_nistz256-x86_64.s",
"ec/x25519-x86_64.s",
"ec/x25519-x86_64.s",
"md5/md5-x86_64.s",
"modes/aesni-gcm-x86_64.s",
"modes/ghash-x86_64.s",
"poly1305/poly1305-x86_64.s",
"rc4/rc4-md5-x86_64.s",
"rc4/rc4-x86_64.s",
"sha/keccak1600-x86_64.s",
"sha/sha1-mb-x86_64.s",
"sha/sha1-x86_64.s",
"sha/sha256-mb-x86_64.s",
"sha/sha256-x86_64.s",
"sha/sha512-x86_64.s",
"whrlpool/wp-x86_64.s",

"x86_64cpuid.s",
"bn/x86_64-gf2m.s",
"bn/x86_64-mont5.s",
"bn/x86_64-mont.s",
"bn/rsaz-avx2.s",
"bn/rsaz-2k-avx512.s",
"bn/rsaz-3k-avx512.s",
"bn/rsaz-4k-avx512.s",

"modes/aes-gcm-avx512.s",
},
.flags = &crypto_flags,
}),
else => {},
if (res: {
for (config.variants) |vari| {
if (target.result.cpu.arch == vari.arch and
target.result.os.tag == vari.os)
{
break :res vari;
}
}
break :res null;
}) |v| {
var files = std.ArrayList([]const u8).initCapacity(b.allocator, v.perl.len) catch @panic("OOM");
for (v.perl) |asm_path| {
const name = std.Io.Dir.path.basename(asm_path);
files.append(b.allocator, b.fmt("{s}.s", .{name})) catch @panic("OOM");
}
mod.addCSourceFiles(.{ .root = b.path(b.fmt("gen/{s}", .{v.flavor})), .files = files.items });
} else {
@panic("Unsupported target architecture for OpenSSL crypto module");
}

mod.addCSourceFiles(.{
Expand Down
2 changes: 1 addition & 1 deletion build.zig.zon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
.name = .openssl,
.version = "3.3.2",
.fingerprint = 0x773a47f1dd422f4c,
.minimum_zig_version = "0.14.0",
.minimum_zig_version = "0.16.0",

.dependencies = .{
.openssl = .{
Expand Down
98 changes: 98 additions & 0 deletions config.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
const std = @import("std");

const PerlInput = struct {
input: []const u8,
};

const arm_aarch64_input = [_][]const u8{
"crypto/md5/asm/md5-aarch64",

//"crypto/armv4cpuid",
//"crypto/modes/asm/ghash-armv4",
"crypto/modes/asm/ghashv8-armx",
"crypto/modes/asm/aes-gcm-armv8-unroll8_64",
"crypto/modes/asm/aes-gcm-armv8_64",
"crypto/sm3/asm/sm3-armv8",
"crypto/sm4/asm/vpsm4-armv8",
"crypto/sm4/asm/vpsm4_ex-armv8",
"crypto/sm4/asm/sm4-armv8",
"crypto/chacha/asm/chacha-armv8",
//"crypto/chacha/asm/chacha-armv4",
"crypto/chacha/asm/chacha-armv8-sve",
//"crypto/poly1305/asm/poly1305-armv4",
"crypto/poly1305/asm/poly1305-armv8",
//"crypto/sha/asm/sha256-armv4",
"crypto/sha/asm/sha512-armv8",
//"crypto/sha/asm/keccak1600-armv4",
"crypto/sha/asm/sha1-armv8",
"crypto/sha/asm/keccak1600-armv8",
//"crypto/sha/asm/sha512-armv4",
//"crypto/sha/asm/sha1-armv4-large",
"crypto/arm64cpuid",
"crypto/perlasm/arm-xlate",
"crypto/aes/asm/vpaes-armv8",
"crypto/aes/asm/aesv8-armx",
//"crypto/aes/asm/bsaes-armv7",
//"crypto/aes/asm/aes-armv4",
"crypto/aes/asm/bsaes-armv8",
"crypto/bn/asm/armv8-mont",
//"crypto/bn/asm/armv4-mont",
//"crypto/bn/asm/armv4-gf2m",

"crypto/ec/asm/ecp_nistz256-armv8",
//"crypto/ec/asm/ecp_nistz256-armv4",
"crypto/ec/asm/ecp_sm2p256-armv8",

};

const x86_input = [_][]const u8{
"crypto/aes/asm/aes-x86_64",
"crypto/aes/asm/aesni-mb-x86_64",
"crypto/aes/asm/aesni-sha1-x86_64",
"crypto/aes/asm/aesni-sha256-x86_64",
"crypto/aes/asm/aesni-x86_64",
"crypto/aes/asm/bsaes-x86_64",
"crypto/aes/asm/vpaes-x86_64",

"crypto/bn/asm/rsaz-x86_64",

"crypto/camellia/asm/cmll-x86_64",
"crypto/chacha/asm/chacha-x86_64",
"crypto/ec/asm/ecp_nistz256-x86_64",
"crypto/ec/asm/x25519-x86_64",
"crypto/ec/asm/x25519-x86_64",
"crypto/md5/asm/md5-x86_64",
"crypto/modes/asm/aesni-gcm-x86_64",
"crypto/modes/asm/ghash-x86_64",
"crypto/poly1305/asm/poly1305-x86_64",
"crypto/rc4/asm/rc4-md5-x86_64",
"crypto/rc4/asm/rc4-x86_64",
"crypto/sha/asm/keccak1600-x86_64",
"crypto/sha/asm/sha1-mb-x86_64",
"crypto/sha/asm/sha1-x86_64",
"crypto/sha/asm/sha256-mb-x86_64",
//"crypto/sha/asm/sha256-x86_64",
"crypto/sha/asm/sha512-x86_64",
"crypto/whrlpool/asm/wp-x86_64",

"crypto/x86_64cpuid",
"crypto/bn/asm/x86_64-gf2m",
"crypto/bn/asm/x86_64-mont5",
"crypto/bn/asm/x86_64-mont",
"crypto/bn/asm/rsaz-avx2",
"crypto/bn/asm/rsaz-2k-avx512",
"crypto/bn/asm/rsaz-3k-avx512",
"crypto/bn/asm/rsaz-4k-avx512",

"crypto/modes/asm/aes-gcm-avx512",
};

pub const Variant = struct { arch: std.Target.Cpu.Arch, os: std.Target.Os.Tag, flavor: []const u8, perl: []const []const u8 };

pub const variants = [_]Variant{
Variant{ .os = .linux, .arch = .x86_64, .flavor = "linux64", .perl = &x86_input },
Variant{ .os = .windows, .arch = .x86_64, .flavor = "win64", .perl = &x86_input },

Variant{ .os = .linux, .arch = .aarch64, .flavor = "linux64", .perl = &arm_aarch64_input },
Variant{ .os = .macos, .arch = .aarch64, .flavor = "ios64", .perl = &arm_aarch64_input },
};
Loading