Skip to content

feat: Allows Simd constructors accept more than just constants #2143

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

Merged
merged 5 commits into from
Apr 9, 2022
Merged

feat: Allows Simd constructors accept more than just constants #2143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7a9a786
init
MaxGraey Nov 13, 2021
2740dd5
fix
MaxGraey Nov 13, 2021
95a63da
refactor
MaxGraey Nov 13, 2021
1a56c29
remove unnecessary stores
MaxGraey Nov 13, 2021
5a6b38d
Merge branch 'main' into v128-from-vars
MaxGraey Apr 9, 2022
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
176 changes: 145 additions & 31 deletions src/builtins.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3542,20 +3542,39 @@ function builtin_i8x16(ctx: BuiltinContext): ExpressionRef {
}
var operands = ctx.operands;
var bytes = new Uint8Array(16);
var vars = new Array<ExpressionRef>(16);
var numVars = 0;

for (let i = 0; i < 16; ++i) {
let expr = compiler.compileExpression(operands[i], Type.i8, Constraints.CONV_IMPLICIT);
let precomp = module.runExpression(expr, ExpressionRunnerFlags.PreserveSideeffects);
if (precomp) {
writeI8(getConstValueI32(precomp), bytes, i);
} else {
compiler.error(
DiagnosticCode.Expression_must_be_a_compile_time_constant,
operands[i].range
);
vars[i] = expr;
numVars++;
}
}
compiler.currentType = Type.v128;
return module.v128(bytes);
if (numVars == 0) {
// all constants
return module.v128(bytes);
} else {
let vec: ExpressionRef;
let fullVars = numVars == 16;
if (fullVars) {
// all variants
vec = module.unary(UnaryOp.SplatI8x16, vars[0]);
} else {
// mixed constants / variants
vec = module.v128(bytes);
}
for (let i = i32(fullVars); i < 16; i++) {
let expr = vars[i];
if (expr) vec = module.simd_replace(SIMDReplaceOp.ReplaceLaneI8x16, vec, <u8>i, expr);
}
return vec;
}
}
builtins.set(BuiltinNames.i8x16, builtin_i8x16);

Expand All @@ -3573,20 +3592,39 @@ function builtin_i16x8(ctx: BuiltinContext): ExpressionRef {
}
var operands = ctx.operands;
var bytes = new Uint8Array(16);
var vars = new Array<ExpressionRef>(8);
var numVars = 0;

for (let i = 0; i < 8; ++i) {
let expr = compiler.compileExpression(operands[i], Type.i16, Constraints.CONV_IMPLICIT);
let precomp = module.runExpression(expr, ExpressionRunnerFlags.PreserveSideeffects);
if (precomp) {
writeI16(getConstValueI32(precomp), bytes, i << 1);
} else {
compiler.error(
DiagnosticCode.Expression_must_be_a_compile_time_constant,
operands[i].range
);
vars[i] = expr;
numVars++;
}
}
compiler.currentType = Type.v128;
return module.v128(bytes);
if (numVars == 0) {
// all constants
return module.v128(bytes);
} else {
let vec: ExpressionRef;
let fullVars = numVars == 8;
if (fullVars) {
// all variants
vec = module.unary(UnaryOp.SplatI16x8, vars[0]);
} else {
// mixed constants / variants
vec = module.v128(bytes);
}
for (let i = i32(fullVars); i < 8; i++) {
let expr = vars[i];
if (expr) vec = module.simd_replace(SIMDReplaceOp.ReplaceLaneI16x8, vec, <u8>i, expr);
}
return vec;
}
}
builtins.set(BuiltinNames.i16x8, builtin_i16x8);

Expand All @@ -3604,20 +3642,39 @@ function builtin_i32x4(ctx: BuiltinContext): ExpressionRef {
}
var operands = ctx.operands;
var bytes = new Uint8Array(16);
var vars = new Array<ExpressionRef>(4);
var numVars = 0;

for (let i = 0; i < 4; ++i) {
let expr = compiler.compileExpression(operands[i], Type.i32, Constraints.CONV_IMPLICIT);
let precomp = module.runExpression(expr, ExpressionRunnerFlags.PreserveSideeffects);
if (precomp) {
writeI32(getConstValueI32(precomp), bytes, i << 2);
} else {
compiler.error(
DiagnosticCode.Expression_must_be_a_compile_time_constant,
operands[i].range
);
vars[i] = expr;
numVars++;
}
}
compiler.currentType = Type.v128;
return module.v128(bytes);
if (numVars == 0) {
// all constants
return module.v128(bytes);
} else {
let vec: ExpressionRef;
let fullVars = numVars == 4;
if (fullVars) {
// all variants
vec = module.unary(UnaryOp.SplatI32x4, vars[0]);
} else {
// mixed constants / variants
vec = module.v128(bytes);
}
for (let i = i32(fullVars); i < 4; i++) {
let expr = vars[i];
if (expr) vec = module.simd_replace(SIMDReplaceOp.ReplaceLaneI32x4, vec, <u8>i, expr);
}
return vec;
}
}
builtins.set(BuiltinNames.i32x4, builtin_i32x4);

Expand All @@ -3635,22 +3692,41 @@ function builtin_i64x2(ctx: BuiltinContext): ExpressionRef {
}
var operands = ctx.operands;
var bytes = new Uint8Array(16);
var vars = new Array<ExpressionRef>(2);
var numVars = 0;

for (let i = 0; i < 2; ++i) {
let expr = compiler.compileExpression(operands[i], Type.i64, Constraints.CONV_IMPLICIT);
let precomp = module.runExpression(expr, ExpressionRunnerFlags.PreserveSideeffects);
if (precomp) {
let off = i << 3;
writeI32(getConstValueI64Low(precomp), bytes, off);
writeI32(getConstValueI64Low(precomp), bytes, off + 0);
writeI32(getConstValueI64High(precomp), bytes, off + 4);
} else {
compiler.error(
DiagnosticCode.Expression_must_be_a_compile_time_constant,
operands[i].range
);
vars[i] = expr;
numVars++;
}
}
compiler.currentType = Type.v128;
return module.v128(bytes);
if (numVars == 0) {
// all constants
return module.v128(bytes);
} else {
let vec: ExpressionRef;
let fullVars = numVars == 2;
if (fullVars) {
// all variants
vec = module.unary(UnaryOp.SplatI64x2, vars[0]);
} else {
// mixed constants / variants
vec = module.v128(bytes);
}
for (let i = i32(fullVars); i < 2; i++) {
let expr = vars[i];
if (expr) vec = module.simd_replace(SIMDReplaceOp.ReplaceLaneI64x2, vec, <u8>i, expr);
}
return vec;
}
}
builtins.set(BuiltinNames.i64x2, builtin_i64x2);

Expand All @@ -3668,20 +3744,39 @@ function builtin_f32x4(ctx: BuiltinContext): ExpressionRef {
}
var operands = ctx.operands;
var bytes = new Uint8Array(16);
var vars = new Array<ExpressionRef>(4);
var numVars = 0;

for (let i = 0; i < 4; ++i) {
let expr = compiler.compileExpression(operands[i], Type.f32, Constraints.CONV_IMPLICIT);
let precomp = module.runExpression(expr, ExpressionRunnerFlags.PreserveSideeffects);
if (precomp) {
writeF32(getConstValueF32(precomp), bytes, i << 2);
} else {
compiler.error(
DiagnosticCode.Expression_must_be_a_compile_time_constant,
operands[i].range
);
vars[i] = expr;
numVars++;
}
}
compiler.currentType = Type.v128;
return module.v128(bytes);
if (numVars == 0) {
// all constants
return module.v128(bytes);
} else {
let vec: ExpressionRef;
let fullVars = numVars == 4;
if (fullVars) {
// all variants
vec = module.unary(UnaryOp.SplatF32x4, vars[0]);
} else {
// mixed constants / variants
vec = module.v128(bytes);
}
for (let i = i32(fullVars); i < 4; i++) {
let expr = vars[i];
if (expr) vec = module.simd_replace(SIMDReplaceOp.ReplaceLaneF32x4, vec, <u8>i, expr);
}
return vec;
}
}
builtins.set(BuiltinNames.f32x4, builtin_f32x4);

Expand All @@ -3699,20 +3794,39 @@ function builtin_f64x2(ctx: BuiltinContext): ExpressionRef {
}
var operands = ctx.operands;
var bytes = new Uint8Array(16);
var vars = new Array<ExpressionRef>(2);
var numVars = 0;

for (let i = 0; i < 2; ++i) {
let expr = compiler.compileExpression(operands[i], Type.f64, Constraints.CONV_IMPLICIT);
let precomp = module.runExpression(expr, ExpressionRunnerFlags.PreserveSideeffects);
if (precomp) {
writeF64(getConstValueF64(precomp), bytes, i << 3);
} else {
compiler.error(
DiagnosticCode.Expression_must_be_a_compile_time_constant,
operands[i].range
);
vars[i] = expr;
numVars++;
}
}
compiler.currentType = Type.v128;
return module.v128(bytes);
if (numVars == 0) {
// all constants
return module.v128(bytes);
} else {
let vec: ExpressionRef;
let fullVars = numVars == 2;
if (fullVars) {
// all variants
vec = module.unary(UnaryOp.SplatF64x2, vars[0]);
} else {
// mixed constants / variants
vec = module.v128(bytes);
}
for (let i = i32(fullVars); i < 2; i++) {
let expr = vars[i];
if (expr) vec = module.simd_replace(SIMDReplaceOp.ReplaceLaneF64x2, vec, <u8>i, expr);
}
return vec;
}
}
builtins.set(BuiltinNames.f64x2, builtin_f64x2);

Expand Down
Loading