summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/asm2wasm.h111
-rw-r--r--src/emscripten-optimizer/optimizer-shared.cpp22
-rw-r--r--src/emscripten-optimizer/parser.cpp1
-rw-r--r--src/emscripten-optimizer/parser.h1
-rw-r--r--src/emscripten-optimizer/simple_ast.cpp2
-rw-r--r--src/emscripten-optimizer/simple_ast.h24
6 files changed, 86 insertions, 75 deletions
diff --git a/src/asm2wasm.h b/src/asm2wasm.h
index 77be6aad2..bc65e87fc 100644
--- a/src/asm2wasm.h
+++ b/src/asm2wasm.h
@@ -358,14 +358,14 @@ public:
private:
AsmType detectAsmType(Ref ast, AsmData *data) {
- if (ast[0] == NAME) {
+ if (ast->isArray(NAME)) {
IString name = ast[1]->getIString();
if (!data->isLocal(name)) {
// must be global
assert(mappedGlobals.find(name) != mappedGlobals.end());
return wasmToAsmType(mappedGlobals[name].type);
}
- } else if (ast[0] == SUB && ast[1][0] == NAME) {
+ } else if (ast->isArray(SUB) && ast[1][0] == NAME) {
// could be a heap access, use view info
auto view = views.find(ast[1][1]->getIString());
if (view != views.end()) {
@@ -456,31 +456,31 @@ private:
std::map<unsigned, Ref> tempNums;
Literal checkLiteral(Ref ast, bool rawIsInteger = true) {
- if (ast[0] == NUM) {
+ if (ast->isNumber()) {
if (rawIsInteger) {
- return Literal((int32_t)ast[1]->getInteger());
+ return Literal((int32_t)ast->getInteger());
} else {
- return Literal(ast[1]->getNumber());
+ return Literal(ast->getNumber());
}
} else if (ast[0] == UNARY_PREFIX) {
- if (ast[1] == PLUS && ast[2][0] == NUM) {
- return Literal((double)ast[2][1]->getNumber());
+ if (ast[1] == PLUS && ast[2]->isNumber()) {
+ return Literal((double)ast[2]->getNumber());
}
- if (ast[1] == MINUS && ast[2][0] == NUM) {
- double num = -ast[2][1]->getNumber();
+ if (ast[1] == MINUS && ast[2]->isNumber()) {
+ double num = -ast[2]->getNumber();
if (isSInteger32(num)) return Literal((int32_t)num);
if (isUInteger32(num)) return Literal((uint32_t)num);
assert(false && "expected signed or unsigned int32");
}
- if (ast[1] == PLUS && ast[2][0] == UNARY_PREFIX && ast[2][1] == MINUS && ast[2][2][0] == NUM) {
- return Literal((double)-ast[2][2][1]->getNumber());
+ if (ast[1] == PLUS && ast[2][0] == UNARY_PREFIX && ast[2][1] == MINUS && ast[2][2]->isNumber()) {
+ return Literal((double)-ast[2][2]->getNumber());
}
- if (ast[1] == MINUS && ast[2][0] == UNARY_PREFIX && ast[2][1] == PLUS && ast[2][2][0] == NUM) {
- return Literal((double)-ast[2][2][1]->getNumber());
+ if (ast[1] == MINUS && ast[2][0] == UNARY_PREFIX && ast[2][1] == PLUS && ast[2][2]->isNumber()) {
+ return Literal((double)-ast[2][2]->getNumber());
}
} else if (wasmOnly && ast[0] == CALL && ast[1][0] == NAME && ast[1][1] == I64_CONST) {
- uint64_t low = ast[2][0][1]->getNumber();
- uint64_t high = ast[2][1][1]->getNumber();
+ uint64_t low = ast[2][0]->getNumber();
+ uint64_t high = ast[2][1]->getNumber();
return Literal(uint64_t(low + (high << 32)));
}
return Literal();
@@ -709,29 +709,29 @@ void Asm2WasmBuilder::processAsm(Ref ast) {
Ref pair = curr[1][j];
IString name = pair[0]->getIString();
Ref value = pair[1];
- if (value[0] == NUM) {
+ if (value->isNumber()) {
// global int
- assert(value[1]->getNumber() == 0);
+ assert(value->getNumber() == 0);
allocateGlobal(name, WasmType::i32);
} else if (value[0] == BINARY) {
// int import
- assert(value[1] == OR && value[3][0] == NUM && value[3][1]->getNumber() == 0);
+ assert(value[1] == OR && value[3]->isNumber() && value[3]->getNumber() == 0);
Ref import = value[2]; // env.what
addImport(name, import, WasmType::i32);
} else if (value[0] == UNARY_PREFIX) {
// double import or global
assert(value[1] == PLUS);
Ref import = value[2];
- if (import[0] == NUM) {
+ if (import->isNumber()) {
// global
- assert(import[1]->getNumber() == 0);
+ assert(import->getNumber() == 0);
allocateGlobal(name, WasmType::f64);
} else {
// import
addImport(name, import, WasmType::f64);
}
} else if (value[0] == CALL) {
- assert(value[1][0] == NAME && value[1][1] == Math_fround && value[2][0][0] == NUM && value[2][0][1]->getNumber() == 0);
+ assert(value[1][0] == NAME && value[1][1] == Math_fround && value[2][0]->isNumber() && value[2][0]->getNumber() == 0);
allocateGlobal(name, WasmType::f32);
} else if (value[0] == DOT) {
// simple module.base import. can be a view, or a function.
@@ -850,7 +850,7 @@ void Asm2WasmBuilder::processAsm(Ref ast) {
for (unsigned k = 0; k < contents->size(); k++) {
Ref pair = contents[k];
IString key = pair[0]->getIString();
- if (pair[1][0] == NAME) {
+ if (pair[1]->isArray(NAME)) {
// exporting a function
IString value = pair[1][1]->getIString();
if (key == Name("_emscripten_replace_memory")) {
@@ -875,9 +875,9 @@ void Asm2WasmBuilder::processAsm(Ref ast) {
}
} else {
// export a number. create a global and export it
- assert(pair[1][0] == NUM);
+ assert(pair[1]->isNumber());
assert(exported.count(key) == 0);
- auto value = pair[1][1]->getInteger();
+ auto value = pair[1]->getInteger();
auto global = new Global();
global->name = key;
global->type = i32;
@@ -1231,6 +1231,19 @@ Function* Asm2WasmBuilder::processFunction(Ref ast) {
std::function<Expression* (Ref)> process = [&](Ref ast) -> Expression* {
AstStackHelper astStackHelper(ast); // TODO: only create one when we need it?
+ if (ast->isNumber()) {
+ auto ret = allocator.alloc<Const>();
+ double num = ast->getNumber();
+ if (isSInteger32(num)) {
+ ret->value = Literal(int32_t(toSInteger32(num)));
+ } else if (isUInteger32(num)) {
+ ret->value = Literal(uint32_t(toUInteger32(num)));
+ } else {
+ ret->value = Literal(num);
+ }
+ ret->type = ret->value.type;
+ return ret;
+ }
IString what = ast[0]->getIString();
if (what == STAT) {
return process(ast[1]); // and drop return value, if any
@@ -1287,7 +1300,7 @@ Function* Asm2WasmBuilder::processFunction(Ref ast) {
}
abort_on("confusing assign", ast);
} else if (what == BINARY) {
- if ((ast[1] == OR || ast[1] == TRSHIFT) && ast[3][0] == NUM && ast[3][1]->getNumber() == 0) {
+ if ((ast[1] == OR || ast[1] == TRSHIFT) && ast[3]->isNumber() && ast[3]->getNumber() == 0) {
auto ret = process(ast[2]); // just look through the ()|0 or ()>>>0 coercion
fixCallType(ret, i32);
return ret;
@@ -1344,18 +1357,6 @@ Function* Asm2WasmBuilder::processFunction(Ref ast) {
return call;
}
return ret;
- } else if (what == NUM) {
- auto ret = allocator.alloc<Const>();
- double num = ast[1]->getNumber();
- if (isSInteger32(num)) {
- ret->value = Literal(int32_t(toSInteger32(num)));
- } else if (isUInteger32(num)) {
- ret->value = Literal(uint32_t(toUInteger32(num)));
- } else {
- ret->value = Literal(num);
- }
- ret->type = ret->value.type;
- return ret;
} else if (what == NAME) {
IString name = ast[1]->getIString();
if (functionVariables.has(name)) {
@@ -1424,7 +1425,7 @@ Function* Asm2WasmBuilder::processFunction(Ref ast) {
fixCallType(ret, f64);
return ret;
} else if (ast[1] == MINUS) {
- if (ast[2][0] == NUM || (ast[2][0] == UNARY_PREFIX && ast[2][1] == PLUS && ast[2][2][0] == NUM)) {
+ if (ast[2]->isNumber() || (ast[2]->isArray(UNARY_PREFIX) && ast[2][1] == PLUS && ast[2][2]->isNumber())) {
auto ret = allocator.alloc<Const>();
ret->value = getLiteral(ast);
ret->type = ret->value.type;
@@ -1454,7 +1455,7 @@ Function* Asm2WasmBuilder::processFunction(Ref ast) {
return ret;
} else if (ast[1] == B_NOT) {
// ~, might be ~~ as a coercion or just a not
- if (ast[2][0] == UNARY_PREFIX && ast[2][1] == B_NOT) {
+ if (ast[2]->isArray(UNARY_PREFIX) && ast[2][1] == B_NOT) {
if (imprecise) {
auto ret = allocator.alloc<Unary>();
ret->value = process(ast[2][2]);
@@ -1639,7 +1640,7 @@ Function* Asm2WasmBuilder::processFunction(Ref ast) {
auto num = ast[2]->size();
switch (name.str[0]) {
case 'l': {
- auto align = num == 2 ? ast[2][1][1]->getInteger() : 0;
+ auto align = num == 2 ? ast[2][1]->getInteger() : 0;
if (name == LOAD1) return builder.makeLoad(1, true, 0, 1, process(ast[2][0]), i32);
if (name == LOAD2) return builder.makeLoad(2, true, 0, indexOr(align, 2), process(ast[2][0]), i32);
if (name == LOAD4) return builder.makeLoad(4, true, 0, indexOr(align, 4), process(ast[2][0]), i32);
@@ -1649,7 +1650,7 @@ Function* Asm2WasmBuilder::processFunction(Ref ast) {
break;
}
case 's': {
- auto align = num == 3 ? ast[2][2][1]->getInteger() : 0;
+ auto align = num == 3 ? ast[2][2]->getInteger() : 0;
if (name == STORE1) return builder.makeStore(1, 0, 1, process(ast[2][0]), process(ast[2][1]), i32);
if (name == STORE2) return builder.makeStore(2, 0, indexOr(align, 2), process(ast[2][0]), process(ast[2][1]), i32);
if (name == STORE4) return builder.makeStore(4, 0, indexOr(align, 4), process(ast[2][0]), process(ast[2][1]), i32);
@@ -1788,7 +1789,7 @@ Function* Asm2WasmBuilder::processFunction(Ref ast) {
// function pointers
auto ret = allocator.alloc<CallIndirect>();
Ref target = ast[1];
- assert(target[0] == SUB && target[1][0] == NAME && target[2][0] == BINARY && target[2][1] == AND && target[2][3][0] == NUM); // FUNCTION_TABLE[(expr) & mask]
+ assert(target[0] == SUB && target[1][0] == NAME && target[2][0] == BINARY && target[2][1] == AND && target[2][3]->isNumber()); // FUNCTION_TABLE[(expr) & mask]
ret->target = process(target[2]); // TODO: as an optimization, we could look through the mask
Ref args = ast[2];
for (unsigned i = 0; i < args->size(); i++) {
@@ -1845,7 +1846,7 @@ Function* Asm2WasmBuilder::processFunction(Ref ast) {
ret->name = !!ast[1] ? nameMapper.sourceToUnique(getContinueLabelName(ast[1]->getIString())) : continueStack.back();
return ret;
} else if (what == WHILE) {
- bool forever = ast[1][0] == NUM && ast[1][1]->getInteger() == 1;
+ bool forever = ast[1]->isNumber() && ast[1]->getInteger() == 1;
auto ret = allocator.alloc<Loop>();
IString out, in;
if (!parentLabel.isNull()) {
@@ -1890,7 +1891,7 @@ Function* Asm2WasmBuilder::processFunction(Ref ast) {
nameMapper.popLabelName(out);
return ret;
} else if (what == DO) {
- if (ast[1][0] == NUM && ast[1][1]->getNumber() == 0) {
+ if (ast[1]->isNumber() && ast[1]->getNumber() == 0) {
// one-time loop, unless there is a continue
IString stop;
if (!parentLabel.isNull()) {
@@ -2020,27 +2021,27 @@ Function* Asm2WasmBuilder::processFunction(Ref ast) {
// (HEAP32[tempDoublePtr >> 2] = i, Math_fround(HEAPF32[tempDoublePtr >> 2])); // i32->f32
// (HEAP32[tempDoublePtr >> 2] = i, +HEAPF32[tempDoublePtr >> 2]); // i32->f32, no fround
// (HEAPF32[tempDoublePtr >> 2] = f, HEAP32[tempDoublePtr >> 2] | 0); // f32->i32
- if (ast[1][0] == ASSIGN && ast[1][2][0] == SUB && ast[1][2][1][0] == NAME && ast[1][2][2][0] == BINARY && ast[1][2][2][1] == RSHIFT &&
- ast[1][2][2][2][0] == NAME && ast[1][2][2][2][1] == tempDoublePtr && ast[1][2][2][3][0] == NUM && ast[1][2][2][3][1]->getNumber() == 2) {
+ if (ast[1]->isArray(ASSIGN) && ast[1][2]->isArray(SUB) && ast[1][2][1]->isArray(NAME) && ast[1][2][2]->isArray(BINARY) && ast[1][2][2][1] == RSHIFT &&
+ ast[1][2][2][2]->isArray(NAME) && ast[1][2][2][2][1] == tempDoublePtr && ast[1][2][2][3]->isNumber() && ast[1][2][2][3]->getNumber() == 2) {
// (?[tempDoublePtr >> 2] = ?, ?) so far
auto heap = ast[1][2][1][1]->getIString();
if (views.find(heap) != views.end()) {
AsmType writeType = views[heap].type;
AsmType readType = ASM_NONE;
Ref readValue;
- if (ast[2][0] == BINARY && ast[2][1] == OR && ast[2][3][0] == NUM && ast[2][3][1]->getNumber() == 0) {
+ if (ast[2]->isArray(BINARY) && ast[2][1] == OR && ast[2][3]->isNumber() && ast[2][3]->getNumber() == 0) {
readType = ASM_INT;
readValue = ast[2][2];
- } else if (ast[2][0] == UNARY_PREFIX && ast[2][1] == PLUS) {
+ } else if (ast[2]->isArray(UNARY_PREFIX) && ast[2][1] == PLUS) {
readType = ASM_DOUBLE;
readValue = ast[2][2];
- } else if (ast[2][0] == CALL && ast[2][1][0] == NAME && ast[2][1][1] == Math_fround) {
+ } else if (ast[2]->isArray(CALL) && ast[2][1]->isArray(NAME) && ast[2][1][1] == Math_fround) {
readType = ASM_FLOAT;
readValue = ast[2][2][0];
}
if (readType != ASM_NONE) {
- if (readValue[0] == SUB && readValue[1][0] == NAME && readValue[2][0] == BINARY && readValue[2][1] == RSHIFT &&
- readValue[2][2][0] == NAME && readValue[2][2][1] == tempDoublePtr && readValue[2][3][0] == NUM && readValue[2][3][1]->getNumber() == 2) {
+ if (readValue->isArray(SUB) && readValue[1]->isArray(NAME) && readValue[2]->isArray(BINARY) && readValue[2][1] == RSHIFT &&
+ readValue[2][2]->isArray(NAME) && readValue[2][2][1] == tempDoublePtr && readValue[2][3]->isNumber() && readValue[2][3]->getNumber() == 2) {
// pattern looks right!
Ref writtenValue = ast[1][3];
if (writeType == ASM_INT && (readType == ASM_FLOAT || readType == ASM_DOUBLE)) {
@@ -2242,12 +2243,12 @@ Function* Asm2WasmBuilder::processFunction(Ref ast) {
processUnshifted = [&](Ref ptr, unsigned bytes) {
auto shifts = bytesToShift(bytes);
// HEAP?[addr >> ?], or HEAP8[x | 0]
- if ((ptr[0] == BINARY && ptr[1] == RSHIFT && ptr[3][0] == NUM && ptr[3][1]->getInteger() == shifts) ||
- (bytes == 1 && ptr[0] == BINARY && ptr[1] == OR && ptr[3][0] == NUM && ptr[3][1]->getInteger() == 0)) {
+ if ((ptr->isArray(BINARY) && ptr[1] == RSHIFT && ptr[3]->isNumber() && ptr[3]->getInteger() == shifts) ||
+ (bytes == 1 && ptr->isArray(BINARY) && ptr[1] == OR && ptr[3]->isNumber() && ptr[3]->getInteger() == 0)) {
return process(ptr[2]); // look through it
- } else if (ptr[0] == NUM) {
+ } else if (ptr->isNumber()) {
// constant, apply a shift (e.g. HEAP32[1] is address 4)
- unsigned addr = ptr[1]->getInteger();
+ unsigned addr = ptr->getInteger();
unsigned shifted = addr << shifts;
return (Expression*)builder.makeConst(Literal(int32_t(shifted)));
}
diff --git a/src/emscripten-optimizer/optimizer-shared.cpp b/src/emscripten-optimizer/optimizer-shared.cpp
index 57b7921fa..b2c03cf28 100644
--- a/src/emscripten-optimizer/optimizer-shared.cpp
+++ b/src/emscripten-optimizer/optimizer-shared.cpp
@@ -53,12 +53,13 @@ HeapInfo parseHeap(const char *name) {
}
AsmType detectType(Ref node, AsmData *asmData, bool inVarDef, IString minifiedFround, bool allowI64) {
+ if (node->isNumber()) {
+ if (!wasm::isInteger(node->getNumber())) return ASM_DOUBLE;
+ return ASM_INT;
+ }
switch (node[0]->getCString()[0]) {
case 'n': {
- if (node[0] == NUM) {
- if (!wasm::isInteger(node[1]->getNumber())) return ASM_DOUBLE;
- return ASM_INT;
- } else if (node[0] == NAME) {
+ if (node[0] == NAME) {
if (asmData) {
AsmType ret = asmData->getType(node[1]->getCString());
if (ret != ASM_NONE) return ret;
@@ -141,6 +142,13 @@ static void abort_on(Ref node) {
}
AsmSign detectSign(Ref node, IString minifiedFround) {
+ if (node->isNumber()) {
+ double value = node->getNumber();
+ if (value < 0) return ASM_SIGNED;
+ if (value > uint32_t(-1) || fmod(value, 1) != 0) return ASM_NONSIGNED;
+ if (wasm::isSInteger32(value)) return ASM_FLEXIBLE;
+ return ASM_UNSIGNED;
+ }
IString type = node[0]->getIString();
if (type == BINARY) {
IString op = node[1]->getIString();
@@ -162,12 +170,6 @@ AsmSign detectSign(Ref node, IString minifiedFround) {
case '~': return ASM_SIGNED;
default: abort_on(node);
}
- } else if (type == NUM) {
- double value = node[1]->getNumber();
- if (value < 0) return ASM_SIGNED;
- if (value > uint32_t(-1) || fmod(value, 1) != 0) return ASM_NONSIGNED;
- if (wasm::isSInteger32(value)) return ASM_FLEXIBLE;
- return ASM_UNSIGNED;
} else if (type == NAME) {
return ASM_FLEXIBLE;
} else if (type == CONDITIONAL) {
diff --git a/src/emscripten-optimizer/parser.cpp b/src/emscripten-optimizer/parser.cpp
index 064c0efcf..d0d5aac54 100644
--- a/src/emscripten-optimizer/parser.cpp
+++ b/src/emscripten-optimizer/parser.cpp
@@ -39,7 +39,6 @@ IString TOPLEVEL("toplevel"),
SEQ("seq"),
SUB("sub"),
CALL("call"),
- NUM("num"),
LABEL("label"),
BREAK("break"),
CONTINUE("continue"),
diff --git a/src/emscripten-optimizer/parser.h b/src/emscripten-optimizer/parser.h
index 060b71272..e43709f9b 100644
--- a/src/emscripten-optimizer/parser.h
+++ b/src/emscripten-optimizer/parser.h
@@ -54,7 +54,6 @@ extern IString TOPLEVEL,
SEQ,
SUB,
CALL,
- NUM,
LABEL,
BREAK,
CONTINUE,
diff --git a/src/emscripten-optimizer/simple_ast.cpp b/src/emscripten-optimizer/simple_ast.cpp
index dddaeab02..4ef6c7f2a 100644
--- a/src/emscripten-optimizer/simple_ast.cpp
+++ b/src/emscripten-optimizer/simple_ast.cpp
@@ -277,6 +277,6 @@ void traverseFunctions(Ref ast, std::function<void (Ref)> visit) {
// ValueBuilder
-IStringSet ValueBuilder::statable("assign call binary unary-prefix name num conditional dot new sub seq string object array");
+IStringSet ValueBuilder::statable("assign call binary unary-prefix name conditional dot new sub seq string object array");
} // namespace cashew
diff --git a/src/emscripten-optimizer/simple_ast.h b/src/emscripten-optimizer/simple_ast.h
index 20de952c1..bb757e260 100644
--- a/src/emscripten-optimizer/simple_ast.h
+++ b/src/emscripten-optimizer/simple_ast.h
@@ -204,6 +204,14 @@ struct Value {
bool isBool(bool b) { return type == Bool && b == boo; } // avoid overloading == as it might overload over int
+ // convenience function to check if something is an array and
+ // also has a certain string as the first element. This is a
+ // very common operation as the first element defines the node
+ // type for most ast nodes
+ bool isArray(IString name) {
+ return isArray() && (*this)[0] == name;
+ }
+
const char* getCString() {
assert(isString());
return str.str;
@@ -655,6 +663,10 @@ struct JSPrinter {
void print(Ref node) {
ensure();
+ if (node->isNumber()) {
+ printNum(node);
+ return;
+ }
IString type = node[0]->getIString();
//fprintf(stderr, "printing %s\n", type.str);
switch (type.str[0]) {
@@ -697,7 +709,6 @@ struct JSPrinter {
}
case 'n': {
if (type == NAME) printName(node);
- else if (type == NUM) printNum(node);
else if (type == NEW) printNew(node);
else abort();
break;
@@ -957,7 +968,7 @@ struct JSPrinter {
}
void printNum(Ref node) {
- emit(numToString(node[1]->getNumber(), finalize));
+ emit(numToString(node->getNumber(), finalize));
}
void printString(Ref node) {
@@ -1030,8 +1041,8 @@ struct JSPrinter {
}
void printUnaryPrefix(Ref node) {
- if (finalize && node[1] == PLUS && (node[2][0] == NUM ||
- (node[2][0] == UNARY_PREFIX && node[2][1] == MINUS && node[2][2][0] == NUM))) {
+ if (finalize && node[1] == PLUS && (node[2]->isNumber() ||
+ (node[2][0] == UNARY_PREFIX && node[2][1] == MINUS && node[2][2]->isNumber()))) {
// emit a finalized number
int last = used;
print(node[2]);
@@ -1449,7 +1460,7 @@ public:
}
static Ref makeStatement(Ref contents) {
- if (statable.has(contents[0]->getIString())) {
+ if (contents->isNumber() || statable.has(contents[0]->getIString())) {
return &makeRawArray(2)->push_back(makeRawString(STAT))
.push_back(contents);
} else {
@@ -1458,8 +1469,7 @@ public:
}
static Ref makeDouble(double num) {
- return &makeRawArray(2)->push_back(makeRawString(NUM))
- .push_back(&arena.alloc()->setNumber(num));
+ return &arena.alloc()->setNumber(num);
}
static Ref makeInt(uint32_t num) {
return makeDouble(double(num));
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-05 23:58:03 +0000