Skip to content

[Strings] Remove stringview types and instructions #6579

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 7 commits into from
May 15, 2024
Merged

[Strings] Remove stringview types and instructions #6579

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1e127e0
Remove stringview types and instructions
tlively May 10, 2024
0cde126
Emit stringview conversions in binary writer
tlively May 12, 2024
03ffb8e
address comments
tlively May 13, 2024
ed26217
optimize gets
tlively May 14, 2024
3705c4f
ignore string.as_wtf16 in binary
tlively May 14, 2024
4f09566
fix
tlively May 15, 2024
8fa2cc9
shrink level 3 to exercise stack ir changes
tlively May 15, 2024
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
15 changes: 4 additions & 11 deletions scripts/gen-s-parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -620,6 +620,7 @@
("string.measure_utf8", "makeStringMeasure(s, StringMeasureUTF8)"),
("string.measure_wtf8", "makeStringMeasure(s, StringMeasureWTF8)"),
("string.measure_wtf16", "makeStringMeasure(s, StringMeasureWTF16)"),
("stringview_wtf16.length", "makeStringMeasure(s, StringMeasureWTF16)"),
("string.is_usv_sequence", "makeStringMeasure(s, StringMeasureIsUSV)"),
("string.hash", "makeStringMeasure(s, StringMeasureHash)"),
("string.encode_utf8", "makeStringEncode(s, StringEncodeUTF8)"),
Expand All @@ -633,18 +634,10 @@
("string.concat", "makeStringConcat(s)"),
("string.eq", "makeStringEq(s, StringEqEqual)"),
("string.compare", "makeStringEq(s, StringEqCompare)"),
("string.as_wtf8", "makeStringAs(s, StringAsWTF8)"),
("string.as_wtf16", "makeStringAs(s, StringAsWTF16)"),
("string.as_iter", "makeStringAs(s, StringAsIter)"),
("stringview_wtf8.advance", "makeStringWTF8Advance(s)"),
("stringview_wtf16.get_codeunit", "makeStringWTF16Get(s)"),
("stringview_iter.next", "makeStringIterNext(s)"),
("stringview_iter.advance", "makeStringIterMove(s, StringIterMoveAdvance)"),
("stringview_iter.rewind", "makeStringIterMove(s, StringIterMoveRewind)"),
("stringview_wtf8.slice", "makeStringSliceWTF(s, StringSliceWTF8)"),
("stringview_wtf16.slice", "makeStringSliceWTF(s, StringSliceWTF16)"),
("stringview_iter.slice", "makeStringSliceIter(s)"),
("stringview_wtf16.length", "makeStringMeasure(s, StringMeasureWTF16View)"),
("stringview_wtf16.slice", "makeStringSliceWTF(s)"),
# Ignored in input
("string.as_wtf16", "ignore(s)"),
]


Expand Down
225 changes: 1 addition & 224 deletions src/binaryen-c.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,6 @@ BinaryenLiteral toBinaryenLiteral(Literal x) {
case HeapType::exn:
WASM_UNREACHABLE("invalid type");
case HeapType::string:
case HeapType::stringview_wtf8:
case HeapType::stringview_wtf16:
case HeapType::stringview_iter:
WASM_UNREACHABLE("TODO: string literals");
case HeapType::none:
case HeapType::noext:
Expand Down Expand Up @@ -150,9 +147,6 @@ Literal fromBinaryenLiteral(BinaryenLiteral x) {
case HeapType::exn:
WASM_UNREACHABLE("invalid type");
case HeapType::string:
case HeapType::stringview_wtf8:
case HeapType::stringview_wtf16:
case HeapType::stringview_iter:
WASM_UNREACHABLE("TODO: string literals");
case HeapType::none:
case HeapType::noext:
Expand Down Expand Up @@ -218,15 +212,6 @@ BinaryenType BinaryenTypeArrayref(void) {
BinaryenType BinaryenTypeStringref() {
return Type(HeapType::string, Nullable).getID();
}
BinaryenType BinaryenTypeStringviewWTF8() {
return Type(HeapType::stringview_wtf8, Nullable).getID();
}
BinaryenType BinaryenTypeStringviewWTF16() {
return Type(HeapType::stringview_wtf16, Nullable).getID();
}
BinaryenType BinaryenTypeStringviewIter() {
return Type(HeapType::stringview_iter, Nullable).getID();
}
BinaryenType BinaryenTypeNullref() {
return Type(HeapType::none, Nullable).getID();
}
Expand Down Expand Up @@ -303,18 +288,6 @@ BinaryenHeapType BinaryenHeapTypeArray() {
BinaryenHeapType BinaryenHeapTypeString() {
return static_cast<BinaryenHeapType>(HeapType::BasicHeapType::string);
}
BinaryenHeapType BinaryenHeapTypeStringviewWTF8() {
return static_cast<BinaryenHeapType>(
HeapType::BasicHeapType::stringview_wtf8);
}
BinaryenHeapType BinaryenHeapTypeStringviewWTF16() {
return static_cast<BinaryenHeapType>(
HeapType::BasicHeapType::stringview_wtf16);
}
BinaryenHeapType BinaryenHeapTypeStringviewIter() {
return static_cast<BinaryenHeapType>(
HeapType::BasicHeapType::stringview_iter);
}
BinaryenHeapType BinaryenHeapTypeNone() {
return static_cast<BinaryenHeapType>(HeapType::BasicHeapType::none);
}
Expand Down Expand Up @@ -1063,9 +1036,6 @@ BinaryenOp BinaryenStringMeasureUTF8(void) { return StringMeasureUTF8; }
BinaryenOp BinaryenStringMeasureWTF8(void) { return StringMeasureWTF8; }
BinaryenOp BinaryenStringMeasureWTF16(void) { return StringMeasureWTF16; }
BinaryenOp BinaryenStringMeasureIsUSV(void) { return StringMeasureIsUSV; }
BinaryenOp BinaryenStringMeasureWTF16View(void) {
return StringMeasureWTF16View;
}
BinaryenOp BinaryenStringEncodeUTF8(void) { return StringEncodeUTF8; }
BinaryenOp BinaryenStringEncodeLossyUTF8(void) { return StringEncodeLossyUTF8; }
BinaryenOp BinaryenStringEncodeWTF8(void) { return StringEncodeWTF8; }
Expand All @@ -1078,13 +1048,6 @@ BinaryenOp BinaryenStringEncodeWTF8Array(void) { return StringEncodeWTF8Array; }
BinaryenOp BinaryenStringEncodeWTF16Array(void) {
return StringEncodeWTF16Array;
}
BinaryenOp BinaryenStringAsWTF8(void) { return StringAsWTF8; }
BinaryenOp BinaryenStringAsWTF16(void) { return StringAsWTF16; }
BinaryenOp BinaryenStringAsIter(void) { return StringAsIter; }
BinaryenOp BinaryenStringIterMoveAdvance(void) { return StringIterMoveAdvance; }
BinaryenOp BinaryenStringIterMoveRewind(void) { return StringIterMoveRewind; }
BinaryenOp BinaryenStringSliceWTF8(void) { return StringSliceWTF8; }
BinaryenOp BinaryenStringSliceWTF16(void) { return StringSliceWTF16; }
BinaryenOp BinaryenStringEqEqual(void) { return StringEqEqual; }
BinaryenOp BinaryenStringEqCompare(void) { return StringEqCompare; }

Expand Down Expand Up @@ -1942,60 +1905,22 @@ BinaryenExpressionRef BinaryenStringEq(BinaryenModuleRef module,
Builder(*(Module*)module)
.makeStringEq(StringEqOp(op), (Expression*)left, (Expression*)right));
}
BinaryenExpressionRef BinaryenStringAs(BinaryenModuleRef module,
BinaryenOp op,
BinaryenExpressionRef ref) {
return static_cast<Expression*>(
Builder(*(Module*)module).makeStringAs(StringAsOp(op), (Expression*)ref));
}
BinaryenExpressionRef BinaryenStringWTF8Advance(BinaryenModuleRef module,
BinaryenExpressionRef ref,
BinaryenExpressionRef pos,
BinaryenExpressionRef bytes) {
return static_cast<Expression*>(Builder(*(Module*)module)
.makeStringWTF8Advance((Expression*)ref,
(Expression*)pos,
(Expression*)bytes));
}
BinaryenExpressionRef BinaryenStringWTF16Get(BinaryenModuleRef module,
BinaryenExpressionRef ref,
BinaryenExpressionRef pos) {
return static_cast<Expression*>(
Builder(*(Module*)module)
.makeStringWTF16Get((Expression*)ref, (Expression*)pos));
}
BinaryenExpressionRef BinaryenStringIterNext(BinaryenModuleRef module,
BinaryenExpressionRef ref) {
return static_cast<Expression*>(
Builder(*(Module*)module).makeStringIterNext((Expression*)ref));
}
BinaryenExpressionRef BinaryenStringIterMove(BinaryenModuleRef module,
BinaryenOp op,
BinaryenExpressionRef ref,
BinaryenExpressionRef num) {
return static_cast<Expression*>(Builder(*(Module*)module)
.makeStringIterMove(StringIterMoveOp(op),
(Expression*)ref,
(Expression*)num));
}
BinaryenExpressionRef BinaryenStringSliceWTF(BinaryenModuleRef module,
BinaryenOp op,
BinaryenExpressionRef ref,
BinaryenExpressionRef start,
BinaryenExpressionRef end) {
return static_cast<Expression*>(Builder(*(Module*)module)
.makeStringSliceWTF(StringSliceWTFOp(op),
(Expression*)ref,
.makeStringSliceWTF((Expression*)ref,
(Expression*)start,
(Expression*)end));
}
BinaryenExpressionRef BinaryenStringSliceIter(BinaryenModuleRef module,
BinaryenExpressionRef ref,
BinaryenExpressionRef num) {
return static_cast<Expression*>(
Builder(*(Module*)module)
.makeStringSliceIter((Expression*)ref, (Expression*)num));
}

// Expression utility

Expand Down Expand Up @@ -4720,69 +4645,6 @@ void BinaryenStringEqSetRight(BinaryenExpressionRef expr,
assert(rightExpr);
static_cast<StringEq*>(expression)->right = (Expression*)rightExpr;
}
// StringAs
BinaryenOp BinaryenStringAsGetOp(BinaryenExpressionRef expr) {
auto* expression = (Expression*)expr;
assert(expression->is<StringAs>());
return static_cast<StringAs*>(expression)->op;
}
void BinaryenStringAsSetOp(BinaryenExpressionRef expr, BinaryenOp op) {
auto* expression = (Expression*)expr;
assert(expression->is<StringAs>());
static_cast<StringAs*>(expression)->op = StringAsOp(op);
}
BinaryenExpressionRef BinaryenStringAsGetRef(BinaryenExpressionRef expr) {
auto* expression = (Expression*)expr;
assert(expression->is<StringAs>());
return static_cast<StringAs*>(expression)->ref;
}
void BinaryenStringAsSetRef(BinaryenExpressionRef expr,
BinaryenExpressionRef refExpr) {
auto* expression = (Expression*)expr;
assert(expression->is<StringAs>());
assert(refExpr);
static_cast<StringAs*>(expression)->ref = (Expression*)refExpr;
}
// StringWTF8Advance
BinaryenExpressionRef
BinaryenStringWTF8AdvanceGetRef(BinaryenExpressionRef expr) {
auto* expression = (Expression*)expr;
assert(expression->is<StringWTF8Advance>());
return static_cast<StringWTF8Advance*>(expression)->ref;
}
void BinaryenStringWTF8AdvanceSetRef(BinaryenExpressionRef expr,
BinaryenExpressionRef refExpr) {
auto* expression = (Expression*)expr;
assert(expression->is<StringWTF8Advance>());
assert(refExpr);
static_cast<StringWTF8Advance*>(expression)->ref = (Expression*)refExpr;
}
BinaryenExpressionRef
BinaryenStringWTF8AdvanceGetPos(BinaryenExpressionRef expr) {
auto* expression = (Expression*)expr;
assert(expression->is<StringWTF8Advance>());
return static_cast<StringWTF8Advance*>(expression)->pos;
}
void BinaryenStringWTF8AdvanceSetPos(BinaryenExpressionRef expr,
BinaryenExpressionRef posExpr) {
auto* expression = (Expression*)expr;
assert(expression->is<StringWTF8Advance>());
assert(posExpr);
static_cast<StringWTF8Advance*>(expression)->pos = (Expression*)posExpr;
}
BinaryenExpressionRef
BinaryenStringWTF8AdvanceGetBytes(BinaryenExpressionRef expr) {
auto* expression = (Expression*)expr;
assert(expression->is<StringWTF8Advance>());
return static_cast<StringWTF8Advance*>(expression)->bytes;
}
void BinaryenStringWTF8AdvanceSetBytes(BinaryenExpressionRef expr,
BinaryenExpressionRef bytesExpr) {
auto* expression = (Expression*)expr;
assert(expression->is<StringWTF8Advance>());
assert(bytesExpr);
static_cast<StringWTF8Advance*>(expression)->bytes = (Expression*)bytesExpr;
}
// StringWTF16Get
BinaryenExpressionRef BinaryenStringWTF16GetGetRef(BinaryenExpressionRef expr) {
auto* expression = (Expression*)expr;
Expand All @@ -4808,65 +4670,7 @@ void BinaryenStringWTF16GetSetPos(BinaryenExpressionRef expr,
assert(posExpr);
static_cast<StringWTF16Get*>(expression)->pos = (Expression*)posExpr;
}
// StringIterNext
BinaryenExpressionRef BinaryenStringIterNextGetRef(BinaryenExpressionRef expr) {
auto* expression = (Expression*)expr;
assert(expression->is<StringIterNext>());
return static_cast<StringIterNext*>(expression)->ref;
}
void BinaryenStringIterNextSetRef(BinaryenExpressionRef expr,
BinaryenExpressionRef refExpr) {
auto* expression = (Expression*)expr;
assert(expression->is<StringIterNext>());
assert(refExpr);
static_cast<StringIterNext*>(expression)->ref = (Expression*)refExpr;
}
// StringIterMove
BinaryenOp BinaryenStringIterMoveGetOp(BinaryenExpressionRef expr) {
auto* expression = (Expression*)expr;
assert(expression->is<StringIterMove>());
return static_cast<StringIterMove*>(expression)->op;
}
void BinaryenStringIterMoveSetOp(BinaryenExpressionRef expr, BinaryenOp op) {
auto* expression = (Expression*)expr;
assert(expression->is<StringIterMove>());
static_cast<StringIterMove*>(expression)->op = StringIterMoveOp(op);
}
BinaryenExpressionRef BinaryenStringIterMoveGetRef(BinaryenExpressionRef expr) {
auto* expression = (Expression*)expr;
assert(expression->is<StringIterMove>());
return static_cast<StringIterMove*>(expression)->ref;
}
void BinaryenStringIterMoveSetRef(BinaryenExpressionRef expr,
BinaryenExpressionRef refExpr) {
auto* expression = (Expression*)expr;
assert(expression->is<StringIterMove>());
assert(refExpr);
static_cast<StringIterMove*>(expression)->ref = (Expression*)refExpr;
}
BinaryenExpressionRef BinaryenStringIterMoveGetNum(BinaryenExpressionRef expr) {
auto* expression = (Expression*)expr;
assert(expression->is<StringIterMove>());
return static_cast<StringIterMove*>(expression)->num;
}
void BinaryenStringIterMoveSetNum(BinaryenExpressionRef expr,
BinaryenExpressionRef numExpr) {
auto* expression = (Expression*)expr;
assert(expression->is<StringIterMove>());
assert(numExpr);
static_cast<StringIterMove*>(expression)->num = (Expression*)numExpr;
}
// StringSliceWTF
BinaryenOp BinaryenStringSliceWTFGetOp(BinaryenExpressionRef expr) {
auto* expression = (Expression*)expr;
assert(expression->is<StringSliceWTF>());
return static_cast<StringSliceWTF*>(expression)->op;
}
void BinaryenStringSliceWTFSetOp(BinaryenExpressionRef expr, BinaryenOp op) {
auto* expression = (Expression*)expr;
assert(expression->is<StringSliceWTF>());
static_cast<StringSliceWTF*>(expression)->op = StringSliceWTFOp(op);
}
BinaryenExpressionRef BinaryenStringSliceWTFGetRef(BinaryenExpressionRef expr) {
auto* expression = (Expression*)expr;
assert(expression->is<StringSliceWTF>());
Expand Down Expand Up @@ -4904,33 +4708,6 @@ void BinaryenStringSliceWTFSetEnd(BinaryenExpressionRef expr,
assert(endExpr);
static_cast<StringSliceWTF*>(expression)->end = (Expression*)endExpr;
}
// StringSliceIter
BinaryenExpressionRef
BinaryenStringSliceIterGetRef(BinaryenExpressionRef expr) {
auto* expression = (Expression*)expr;
assert(expression->is<StringSliceIter>());
return static_cast<StringSliceIter*>(expression)->ref;
}
void BinaryenStringSliceIterSetRef(BinaryenExpressionRef expr,
BinaryenExpressionRef refExpr) {
auto* expression = (Expression*)expr;
assert(expression->is<StringSliceIter>());
assert(refExpr);
static_cast<StringSliceIter*>(expression)->ref = (Expression*)refExpr;
}
BinaryenExpressionRef
BinaryenStringSliceIterGetNum(BinaryenExpressionRef expr) {
auto* expression = (Expression*)expr;
assert(expression->is<StringSliceIter>());
return static_cast<StringSliceIter*>(expression)->num;
}
void BinaryenStringSliceIterSetNum(BinaryenExpressionRef expr,
BinaryenExpressionRef numExpr) {
auto* expression = (Expression*)expr;
assert(expression->is<StringSliceIter>());
assert(numExpr);
static_cast<StringSliceIter*>(expression)->num = (Expression*)numExpr;
}

// Functions

Expand Down
Loading