From 17c8f108a4d4c753e087e23ff5722718a6cd7a6a Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Thu, 30 Jan 2020 17:50:50 -0500 Subject: drop @newStackCall this was causing unrelated behavior tests to fail. if this commit is reverted, the docs are good, but `@newStackCall` is already deprecated in favor of `@call`, supplying the `stack` property. --- src/ir.cpp | 33 --------------------------------- 1 file changed, 33 deletions(-) (limited to 'src/ir.cpp') diff --git a/src/ir.cpp b/src/ir.cpp index ef3426d111..4742d81b23 100644 --- a/src/ir.cpp +++ b/src/ir.cpp @@ -7145,39 +7145,6 @@ static IrInstSrc *ir_gen_builtin_fn_call(IrBuilderSrc *irb, Scope *scope, AstNod IrInstSrc *offset_of = ir_build_bit_offset_of(irb, scope, node, arg0_value, arg1_value); return ir_lval_wrap(irb, scope, offset_of, lval, result_loc); } - case BuiltinFnIdNewStackCall: - { - if (node->data.fn_call_expr.params.length < 2) { - add_node_error(irb->codegen, node, - buf_sprintf("expected at least 2 arguments, found %" ZIG_PRI_usize, - node->data.fn_call_expr.params.length)); - return irb->codegen->invalid_inst_src; - } - - AstNode *new_stack_node = node->data.fn_call_expr.params.at(0); - IrInstSrc *new_stack = ir_gen_node(irb, new_stack_node, scope); - if (new_stack == irb->codegen->invalid_inst_src) - return new_stack; - - AstNode *fn_ref_node = node->data.fn_call_expr.params.at(1); - IrInstSrc *fn_ref = ir_gen_node(irb, fn_ref_node, scope); - if (fn_ref == irb->codegen->invalid_inst_src) - return fn_ref; - - size_t arg_count = node->data.fn_call_expr.params.length - 2; - - IrInstSrc **args = allocate(arg_count); - for (size_t i = 0; i < arg_count; i += 1) { - AstNode *arg_node = node->data.fn_call_expr.params.at(i + 2); - args[i] = ir_gen_node(irb, arg_node, scope); - if (args[i] == irb->codegen->invalid_inst_src) - return args[i]; - } - - IrInstSrc *call = ir_build_call_src(irb, scope, node, nullptr, fn_ref, arg_count, args, - nullptr, CallModifierNone, false, new_stack, result_loc); - return ir_lval_wrap(irb, scope, call, lval, result_loc); - } case BuiltinFnIdCall: { // Cast the options parameter to the options type ZigType *options_type = get_builtin_type(irb->codegen, "CallOptions"); -- cgit v1.2.3 From 94f7c560015f7cb7ed8046339e2d0724dc86fcd6 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Sun, 22 Mar 2020 21:47:19 -0400 Subject: riscv: add -mrelax arg for C to work around upstream issue See #4485 --- src-self-hosted/stage2.zig | 27 ++++++++++++++++++ src/analyze.hpp | 8 +++++- src/codegen.cpp | 70 ++++++++++++++++++++++++++++------------------ src/ir.cpp | 2 +- src/stage2.h | 3 ++ 5 files changed, 81 insertions(+), 29 deletions(-) (limited to 'src/ir.cpp') diff --git a/src-self-hosted/stage2.zig b/src-self-hosted/stage2.zig index f67200097c..ff6ef47344 100644 --- a/src-self-hosted/stage2.zig +++ b/src-self-hosted/stage2.zig @@ -912,6 +912,9 @@ const Stage2Target = extern struct { dynamic_linker: ?[*:0]const u8, standard_dynamic_linker_path: ?[*:0]const u8, + llvm_cpu_features_asm_ptr: [*]const [*:0]const u8, + llvm_cpu_features_asm_len: usize, + fn fromTarget(self: *Stage2Target, cross_target: CrossTarget) !void { const allocator = std.heap.c_allocator; @@ -943,6 +946,12 @@ const Stage2Target = extern struct { var llvm_features_buffer = try std.Buffer.initSize(allocator, 0); defer llvm_features_buffer.deinit(); + // Unfortunately we have to do the work twice, because Clang does not support + // the same command line parameters for CPU features when assembling code as it does + // when compiling C code. + var asm_features_list = std.ArrayList([*:0]const u8).init(allocator); + defer asm_features_list.deinit(); + for (target.cpu.arch.allFeaturesList()) |feature, index_usize| { const index = @intCast(Target.Cpu.Feature.Set.Index, index_usize); const is_enabled = target.cpu.features.isEnabled(index); @@ -963,6 +972,21 @@ const Stage2Target = extern struct { } } + switch (target.cpu.arch) { + .riscv32, .riscv64 => { + if (std.Target.riscv.featureSetHas(target.cpu.features, .relax)) { + try asm_features_list.append("-mrelax"); + } else { + try asm_features_list.append("-mno-relax"); + } + }, + else => { + // TODO + // Argh, why doesn't the assembler accept the list of CPU features?! + // I don't see a way to do this other than hard coding everything. + }, + } + try cpu_builtin_str_buffer.append( \\ }), \\}; @@ -1128,6 +1152,7 @@ const Stage2Target = extern struct { null; const cache_hash_slice = cache_hash.toOwnedSlice(); + const asm_features = asm_features_list.toOwnedSlice(); self.* = .{ .arch = @enumToInt(target.cpu.arch) + 1, // skip over ZigLLVM_UnknownArch .vendor = 0, @@ -1135,6 +1160,8 @@ const Stage2Target = extern struct { .abi = @enumToInt(target.abi), .llvm_cpu_name = if (target.cpu.model.llvm_name) |s| s.ptr else null, .llvm_cpu_features = llvm_features_buffer.toOwnedSlice().ptr, + .llvm_cpu_features_asm_ptr = asm_features.ptr, + .llvm_cpu_features_asm_len = asm_features.len, .cpu_builtin_str = cpu_builtin_str_buffer.toOwnedSlice().ptr, .os_builtin_str = os_builtin_str_buffer.toOwnedSlice().ptr, .cache_hash = cache_hash_slice.ptr, diff --git a/src/analyze.hpp b/src/analyze.hpp index b6404b1882..a7828663b0 100644 --- a/src/analyze.hpp +++ b/src/analyze.hpp @@ -257,7 +257,13 @@ Error create_c_object_cache(CodeGen *g, CacheHash **out_cache_hash, bool verbose LLVMTypeRef get_llvm_type(CodeGen *g, ZigType *type); ZigLLVMDIType *get_llvm_di_type(CodeGen *g, ZigType *type); -void add_cc_args(CodeGen *g, ZigList &args, const char *out_dep_path, bool translate_c); +enum CSourceKind { + CSourceKindAsm, + CSourceKindC, +}; + +void add_cc_args(CodeGen *g, ZigList &args, const char *out_dep_path, bool translate_c, + CSourceKind source_kind); void src_assert(bool ok, AstNode *source_node); bool is_container(ZigType *type_entry); diff --git a/src/codegen.cpp b/src/codegen.cpp index 7d4262d765..3edc99156f 100644 --- a/src/codegen.cpp +++ b/src/codegen.cpp @@ -9155,13 +9155,15 @@ static void detect_libc(CodeGen *g) { } // does not add the "cc" arg -void add_cc_args(CodeGen *g, ZigList &args, const char *out_dep_path, bool translate_c) { +void add_cc_args(CodeGen *g, ZigList &args, const char *out_dep_path, + bool translate_c, CSourceKind source_kind) +{ if (translate_c) { args.append("-x"); args.append("c"); } - if (out_dep_path != nullptr) { + if (source_kind != CSourceKindAsm && out_dep_path != nullptr) { args.append("-MD"); args.append("-MV"); args.append("-MF"); @@ -9176,10 +9178,12 @@ void add_cc_args(CodeGen *g, ZigList &args, const char *out_dep_pa } if (translate_c) { - // this gives us access to preprocessing entities, presumably at - // the cost of performance - args.append("-Xclang"); - args.append("-detailed-preprocessing-record"); + if (source_kind == CSourceKindC) { + // this gives us access to preprocessing entities, presumably at + // the cost of performance + args.append("-Xclang"); + args.append("-detailed-preprocessing-record"); + } } else { switch (g->err_color) { case ErrColorAuto: @@ -9212,26 +9216,29 @@ void add_cc_args(CodeGen *g, ZigList &args, const char *out_dep_pa args.append(include_dir); } - if (g->zig_target->is_native) { - if (target_supports_clang_march_native(g->zig_target)) { - args.append("-march=native"); - } - } else { - args.append("-target"); - args.append(buf_ptr(&g->llvm_triple_str)); + args.append("-target"); + args.append(buf_ptr(&g->llvm_triple_str)); - if (g->zig_target->llvm_cpu_name != nullptr) { - args.append("-Xclang"); - args.append("-target-cpu"); - args.append("-Xclang"); - args.append(g->zig_target->llvm_cpu_name); - } - if (g->zig_target->llvm_cpu_features != nullptr) { - args.append("-Xclang"); - args.append("-target-feature"); - args.append("-Xclang"); - args.append(g->zig_target->llvm_cpu_features); - } + switch (source_kind) { + case CSourceKindC: + if (g->zig_target->llvm_cpu_name != nullptr) { + args.append("-Xclang"); + args.append("-target-cpu"); + args.append("-Xclang"); + args.append(g->zig_target->llvm_cpu_name); + } + if (g->zig_target->llvm_cpu_features != nullptr) { + args.append("-Xclang"); + args.append("-target-feature"); + args.append("-Xclang"); + args.append(g->zig_target->llvm_cpu_features); + } + break; + case CSourceKindAsm: + break; + } + for (size_t i = 0; i < g->zig_target->llvm_cpu_features_asm_len; i += 1) { + args.append(g->zig_target->llvm_cpu_features_asm_ptr[i]); } if (g->zig_target->os == OsFreestanding) { @@ -9377,7 +9384,7 @@ void codegen_translate_c(CodeGen *g, Buf *full_path) { } ZigList clang_argv = {0}; - add_cc_args(g, clang_argv, out_dep_path_cstr, true); + add_cc_args(g, clang_argv, out_dep_path_cstr, true, CSourceKindC); clang_argv.append(buf_ptr(full_path)); @@ -9714,6 +9721,15 @@ static void gen_c_object(CodeGen *g, Buf *self_exe_path, CFile *c_file) { Buf *c_source_basename = buf_alloc(); os_path_split(c_source_file, nullptr, c_source_basename); + CSourceKind c_source_kind; + if (buf_ends_with_str(c_source_basename, ".s") || + buf_ends_with_str(c_source_basename, ".S")) + { + c_source_kind = CSourceKindAsm; + } else { + c_source_kind = CSourceKindC; + } + Stage2ProgressNode *child_prog_node = stage2_progress_start(g->sub_progress_node, buf_ptr(c_source_basename), buf_len(c_source_basename), 0); @@ -9786,7 +9802,7 @@ static void gen_c_object(CodeGen *g, Buf *self_exe_path, CFile *c_file) { } Buf *out_dep_path = buf_sprintf("%s.d", buf_ptr(out_obj_path)); - add_cc_args(g, args, buf_ptr(out_dep_path), false); + add_cc_args(g, args, buf_ptr(out_dep_path), false, c_source_kind); args.append("-o"); args.append(buf_ptr(out_obj_path)); diff --git a/src/ir.cpp b/src/ir.cpp index c8a60c3e57..913cd69cfe 100644 --- a/src/ir.cpp +++ b/src/ir.cpp @@ -25126,7 +25126,7 @@ static IrInstGen *ir_analyze_instruction_c_import(IrAnalyze *ira, IrInstSrcCImpo ZigList clang_argv = {0}; - add_cc_args(ira->codegen, clang_argv, buf_ptr(tmp_dep_file), true); + add_cc_args(ira->codegen, clang_argv, buf_ptr(tmp_dep_file), true, CSourceKindC); clang_argv.append(buf_ptr(&tmp_c_file_path)); diff --git a/src/stage2.h b/src/stage2.h index a66163eceb..8893b1e27b 100644 --- a/src/stage2.h +++ b/src/stage2.h @@ -293,6 +293,9 @@ struct ZigTarget { const char *os_builtin_str; const char *dynamic_linker; const char *standard_dynamic_linker_path; + + const char **llvm_cpu_features_asm_ptr; + size_t llvm_cpu_features_asm_len; }; // ABI warning -- cgit v1.2.3