zig build system: change target, compilation, and module APIs
Introduce the concept of "target query" and "resolved target". A target query is what the user specifies, with some things left to default. A resolved target has the default things discovered and populated. In the future, std.zig.CrossTarget will be rename to std.Target.Query. Introduces `std.Build.resolveTargetQuery` to get from one to the other. The concept of `main_mod_path` is gone, no longer supported. You have to put the root source file at the module root now. * remove deprecated API * update build.zig for the breaking API changes in this branch * move std.Build.Step.Compile.BuildId to std.zig.BuildId * add more options to std.Build.ExecutableOptions, std.Build.ObjectOptions, std.Build.SharedLibraryOptions, std.Build.StaticLibraryOptions, and std.Build.TestOptions. * remove `std.Build.constructCMacro`. There is no use for this API. * deprecate `std.Build.Step.Compile.defineCMacro`. Instead, `std.Build.Module.addCMacro` is provided. - remove `std.Build.Step.Compile.defineCMacroRaw`. * deprecate `std.Build.Step.Compile.linkFrameworkNeeded` - use `std.Build.Module.linkFramework` * deprecate `std.Build.Step.Compile.linkFrameworkWeak` - use `std.Build.Module.linkFramework` * move more logic into `std.Build.Module` * allow `target` and `optimize` to be `null` when creating a Module. Along with other fields, those unspecified options will be inherited from parent `Module` when inserted into an import table. * the `target` field of `addExecutable` is now required. pass `b.host` to get the host target.
This commit is contained in:
@@ -1,9 +1,14 @@
|
||||
const std = @import("std");
|
||||
const Cases = @import("src/Cases.zig");
|
||||
|
||||
pub fn addCases(ctx: *Cases) !void {
|
||||
pub fn addCases(ctx: *Cases, b: *std.Build) !void {
|
||||
const target = b.resolveTargetQuery(.{
|
||||
.cpu_arch = .nvptx64,
|
||||
.os_tag = .cuda,
|
||||
});
|
||||
|
||||
{
|
||||
var case = addPtx(ctx, "simple addition and subtraction");
|
||||
var case = addPtx(ctx, target, "simple addition and subtraction");
|
||||
|
||||
case.addCompile(
|
||||
\\fn add(a: i32, b: i32) i32 {
|
||||
@@ -20,7 +25,7 @@ pub fn addCases(ctx: *Cases) !void {
|
||||
}
|
||||
|
||||
{
|
||||
var case = addPtx(ctx, "read special registers");
|
||||
var case = addPtx(ctx, target, "read special registers");
|
||||
|
||||
case.addCompile(
|
||||
\\fn threadIdX() u32 {
|
||||
@@ -37,7 +42,7 @@ pub fn addCases(ctx: *Cases) !void {
|
||||
}
|
||||
|
||||
{
|
||||
var case = addPtx(ctx, "address spaces");
|
||||
var case = addPtx(ctx, target, "address spaces");
|
||||
|
||||
case.addCompile(
|
||||
\\var x: i32 addrspace(.global) = 0;
|
||||
@@ -50,7 +55,7 @@ pub fn addCases(ctx: *Cases) !void {
|
||||
}
|
||||
|
||||
{
|
||||
var case = addPtx(ctx, "reduce in shared mem");
|
||||
var case = addPtx(ctx, target, "reduce in shared mem");
|
||||
case.addCompile(
|
||||
\\fn threadIdX() u32 {
|
||||
\\ return asm ("mov.u32 \t%[r], %tid.x;"
|
||||
@@ -82,18 +87,10 @@ pub fn addCases(ctx: *Cases) !void {
|
||||
}
|
||||
}
|
||||
|
||||
const nvptx_target = std.zig.CrossTarget{
|
||||
.cpu_arch = .nvptx64,
|
||||
.os_tag = .cuda,
|
||||
};
|
||||
|
||||
pub fn addPtx(
|
||||
ctx: *Cases,
|
||||
name: []const u8,
|
||||
) *Cases.Case {
|
||||
fn addPtx(ctx: *Cases, target: std.Build.ResolvedTarget, name: []const u8) *Cases.Case {
|
||||
ctx.cases.append(.{
|
||||
.name = name,
|
||||
.target = nvptx_target,
|
||||
.target = target,
|
||||
.updates = std.ArrayList(Cases.Update).init(ctx.cases.allocator),
|
||||
.output_mode = .Obj,
|
||||
.deps = std.ArrayList(Cases.DepModule).init(ctx.cases.allocator),
|
||||
|
||||
Reference in New Issue
Block a user