mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-01-10 09:25:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11315 from wsengir/stage2-simplify-muladd

Browse Source 
stage2: simplify mul_add
This commit is contained in:
Veikka Tuominen 2022-03-27 11:12:42 +03:00 committed by GitHub
commit 23507f20b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/Sema.zig
View File

@ -15190,52 +15190,8 @@ fn zirMulAdd(sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileError!Air.
if (maybe_addend) |addend_val| {
if (addend_val.isUndef()) return sema.addConstUndef(ty);
switch (ty.zigTypeTag()) {
.ComptimeFloat, .Float => {
const result_val = try Value.mulAdd(
ty,
mulend1_val,
mulend2_val,
addend_val,
sema.arena,
target,
);
return sema.addConstant(ty, result_val);
},
.Vector => {
const scalar_ty = ty.scalarType();
switch (scalar_ty.zigTypeTag()) {
.ComptimeFloat, .Float => {},
else => return sema.fail(block, src, "expected vector of floats, found vector of '{}'", .{scalar_ty.fmt(target)}),
}
const vec_len = ty.vectorLen();
const result_ty = try Type.vector(sema.arena, vec_len, scalar_ty);
var mulend1_buf: Value.ElemValueBuffer = undefined;
var mulend2_buf: Value.ElemValueBuffer = undefined;
var addend_buf: Value.ElemValueBuffer = undefined;
const elems = try sema.arena.alloc(Value, vec_len);
for (elems) |*elem, i| {
const mulend1_elem_val = mulend1_val.elemValueBuffer(i, &mulend1_buf);
const mulend2_elem_val = mulend2_val.elemValueBuffer(i, &mulend2_buf);
const addend_elem_val = addend_val.elemValueBuffer(i, &addend_buf);
elem.* = try Value.mulAdd(
scalar_ty,
mulend1_elem_val,
mulend2_elem_val,
addend_elem_val,
sema.arena,
target,
);
}
return sema.addConstant(
result_ty,
try Value.Tag.aggregate.create(sema.arena, elems),
);
},
else => unreachable,
}
const result_val = try Value.mulAdd(ty, mulend1_val, mulend2_val, addend_val, sema.arena, target);
return sema.addConstant(ty, result_val);
} else {
break :rs addend_src;
}

6
src/codegen/llvm.zig
View File

@ -5218,6 +5218,7 @@ pub const FuncGen = struct {
const ty = self.air.typeOfIndex(inst);
const llvm_ty = try self.dg.llvmType(ty);
const scalar_ty = ty.scalarType();
const target = self.dg.module.getTarget();
const Strat = union(enum) {
@ -5225,11 +5226,6 @@ pub const FuncGen = struct {
libc: [*:0]const u8,
};
const scalar_ty = if (ty.zigTypeTag() == .Vector)
ty.elemType()
else
ty;
const strat: Strat = switch (scalar_ty.floatBits(target)) {
16, 32, 64 => Strat.intrinsic,
80 => if (CType.longdouble.sizeInBits(target) == 80) Strat{ .intrinsic = {} } else Strat{ .libc = "__fmax" },