Skip to content

[Strings] Add string.compare #5453

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
Jan 25, 2023
Merged

[Strings] Add string.compare #5453

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
0ab0bd2
yolo
kripken Jan 25, 2023
7b5f00b
format
kripken Jan 25, 2023
96e082d
fix
kripken Jan 25, 2023
9189835
builds
kripken Jan 25, 2023
6a55e90
format
kripken Jan 25, 2023
aea4401
finish
kripken Jan 25, 2023
54e9781
fix
kripken Jan 25, 2023
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
3 changes: 2 additions & 1 deletion scripts/gen-s-parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -620,7 +620,8 @@
("string.encode_wtf8_array", "makeStringEncode(s, StringEncodeWTF8Array)"),
("string.encode_wtf16_array", "makeStringEncode(s, StringEncodeWTF16Array)"),
("string.concat", "makeStringConcat(s)"),
("string.eq", "makeStringEq(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)"),
Expand Down
2 changes: 1 addition & 1 deletion src/binaryen-c.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1880,7 +1880,7 @@ BinaryenExpressionRef BinaryenStringEq(BinaryenModuleRef module,
BinaryenExpressionRef right) {
return static_cast<Expression*>(
Builder(*(Module*)module)
.makeStringEq((Expression*)left, (Expression*)right));
.makeStringEq(StringEqEqual, (Expression*)left, (Expression*)right));
}
BinaryenExpressionRef BinaryenStringAs(BinaryenModuleRef module,
BinaryenOp op,
Expand Down
56 changes: 38 additions & 18 deletions src/gen-s-parser.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3138,13 +3138,21 @@ switch (buf[0]) {
}
}
case 'c': {
switch (buf[10]) {
case 'c':
if (op == "string.concat"sv) { return makeStringConcat(s); }
goto parse_error;
case 's':
if (op == "string.const"sv) { return makeStringConst(s); }
switch (buf[9]) {
case 'm':
if (op == "string.compare"sv) { return makeStringEq(s, StringEqCompare); }
goto parse_error;
case 'n': {
switch (buf[10]) {
case 'c':
if (op == "string.concat"sv) { return makeStringConcat(s); }
goto parse_error;
case 's':
if (op == "string.const"sv) { return makeStringConst(s); }
goto parse_error;
default: goto parse_error;
}
}
default: goto parse_error;
}
}
Expand Down Expand Up @@ -3178,7 +3186,7 @@ switch (buf[0]) {
}
}
case 'q':
if (op == "string.eq"sv) { return makeStringEq(s); }
if (op == "string.eq"sv) { return makeStringEq(s, StringEqEqual); }
goto parse_error;
default: goto parse_error;
}
Expand Down Expand Up @@ -8812,21 +8820,33 @@ switch (buf[0]) {
}
}
case 'c': {
switch (buf[10]) {
case 'c':
if (op == "string.concat"sv) {
auto ret = makeStringConcat(ctx, pos);
switch (buf[9]) {
case 'm':
if (op == "string.compare"sv) {
auto ret = makeStringEq(ctx, pos, StringEqCompare);
CHECK_ERR(ret);
return *ret;
}
goto parse_error;
case 's':
if (op == "string.const"sv) {
auto ret = makeStringConst(ctx, pos);
CHECK_ERR(ret);
return *ret;
case 'n': {
switch (buf[10]) {
case 'c':
if (op == "string.concat"sv) {
auto ret = makeStringConcat(ctx, pos);
CHECK_ERR(ret);
return *ret;
}
goto parse_error;
case 's':
if (op == "string.const"sv) {
auto ret = makeStringConst(ctx, pos);
CHECK_ERR(ret);
return *ret;
}
goto parse_error;
default: goto parse_error;
}
goto parse_error;
}
default: goto parse_error;
}
}
Expand Down Expand Up @@ -8877,7 +8897,7 @@ switch (buf[0]) {
}
case 'q':
if (op == "string.eq"sv) {
auto ret = makeStringEq(ctx, pos);
auto ret = makeStringEq(ctx, pos, StringEqEqual);
CHECK_ERR(ret);
return *ret;
}
Expand Down
13 changes: 12 additions & 1 deletion src/passes/Print.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2424,7 +2424,18 @@ struct PrintExpressionContents
void visitStringConcat(StringConcat* curr) {
printMedium(o, "string.concat");
}
void visitStringEq(StringEq* curr) { printMedium(o, "string.eq"); }
void visitStringEq(StringEq* curr) {
switch (curr->op) {
case StringEqEqual:
printMedium(o, "string.eq");
break;
case StringEqCompare:
printMedium(o, "string.compare");
break;
default:
WASM_UNREACHABLE("invalid string.eq*");
}
}
void visitStringAs(StringAs* curr) {
switch (curr->op) {
case StringAsWTF8:
Expand Down
1 change: 1 addition & 0 deletions src/wasm-binary.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1162,6 +1162,7 @@ enum ASTNodes {
StringViewIterAdvance = 0xa2,
StringViewIterRewind = 0xa3,
StringViewIterSlice = 0xa4,
StringCompare = 0xa8,
StringNewWTF8Array = 0xb0,
StringNewWTF16Array = 0xb1,
StringEncodeWTF8Array = 0xb2,
Expand Down
3 changes: 2 additions & 1 deletion src/wasm-builder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1057,8 +1057,9 @@ class Builder {
ret->finalize();
return ret;
}
StringEq* makeStringEq(Expression* left, Expression* right) {
StringEq* makeStringEq(StringEqOp op, Expression* left, Expression* right) {
auto* ret = wasm.allocator.alloc<StringEq>();
ret->op = op;
ret->left = left;
ret->right = right;
ret->finalize();
Expand Down
1 change: 1 addition & 0 deletions src/wasm-delegations-fields.def
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -757,6 +757,7 @@ switch (DELEGATE_ID) {
}
case Expression::Id::StringEqId: {
DELEGATE_START(StringEq);
DELEGATE_FIELD_INT(StringEq, op);
DELEGATE_FIELD_CHILD(StringEq, right);
DELEGATE_FIELD_CHILD(StringEq, left);
DELEGATE_END(StringEq);
Expand Down
2 changes: 1 addition & 1 deletion src/wasm-s-parser.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ class SExpressionWasmBuilder {
Expression* makeStringMeasure(Element& s, StringMeasureOp op);
Expression* makeStringEncode(Element& s, StringEncodeOp op);
Expression* makeStringConcat(Element& s);
Expression* makeStringEq(Element& s);
Expression* makeStringEq(Element& s, StringEqOp op);
Expression* makeStringAs(Element& s, StringAsOp op);
Expression* makeStringWTF8Advance(Element& s);
Expression* makeStringWTF16Get(Element& s);
Expand Down
7 changes: 7 additions & 0 deletions src/wasm.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -605,6 +605,11 @@ enum StringEncodeOp {
StringEncodeWTF16Array,
};

enum StringEqOp {
StringEqEqual,
StringEqCompare,
};

enum StringAsOp {
StringAsWTF8,
StringAsWTF16,
Expand Down Expand Up @@ -1748,6 +1753,8 @@ class StringEq : public SpecificExpression<Expression::StringEqId> {
public:
StringEq(MixedArena& allocator) {}

StringEqOp op;

Expression* left;
Expression* right;

Expand Down
9 changes: 7 additions & 2 deletions src/wasm/wasm-binary.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7345,12 +7345,17 @@ bool WasmBinaryBuilder::maybeVisitStringConcat(Expression*& out,
}

bool WasmBinaryBuilder::maybeVisitStringEq(Expression*& out, uint32_t code) {
if (code != BinaryConsts::StringEq) {
StringEqOp op;
if (code == BinaryConsts::StringEq) {
op = StringEqEqual;
} else if (code == BinaryConsts::StringCompare) {
op = StringEqCompare;
} else {
return false;
}
auto* right = popNonVoidExpression();
auto* left = popNonVoidExpression();
out = Builder(wasm).makeStringEq(left, right);
out = Builder(wasm).makeStringEq(op, left, right);
return true;
}

Expand Down
6 changes: 3 additions & 3 deletions src/wasm/wasm-s-parser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3090,9 +3090,9 @@ Expression* SExpressionWasmBuilder::makeStringConcat(Element& s) {
parseExpression(s[2]));
}

Expression* SExpressionWasmBuilder::makeStringEq(Element& s) {
return Builder(wasm).makeStringEq(parseExpression(s[1]),
parseExpression(s[2]));
Expression* SExpressionWasmBuilder::makeStringEq(Element& s, StringEqOp op) {
return Builder(wasm).makeStringEq(
op, parseExpression(s[1]), parseExpression(s[2]));
}

Expression* SExpressionWasmBuilder::makeStringAs(Element& s, StringAsOp op) {
Expand Down
12 changes: 11 additions & 1 deletion src/wasm/wasm-stack.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2370,7 +2370,17 @@ void BinaryInstWriter::visitStringConcat(StringConcat* curr) {
}

void BinaryInstWriter::visitStringEq(StringEq* curr) {
o << int8_t(BinaryConsts::GCPrefix) << U32LEB(BinaryConsts::StringEq);
o << int8_t(BinaryConsts::GCPrefix);
switch (curr->op) {
case StringEqEqual:
o << U32LEB(BinaryConsts::StringEq);
break;
case StringEqCompare:
o << U32LEB(BinaryConsts::StringCompare);
break;
default:
WASM_UNREACHABLE("invalid string.eq*");
}
}

void BinaryInstWriter::visitStringAs(StringAs* curr) {
Expand Down
5 changes: 3 additions & 2 deletions src/wasm/wat-parser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2383,7 +2383,8 @@ template<typename Ctx>
Result<typename Ctx::InstrT> makeStringEncode(Ctx&, Index, StringEncodeOp op);
template<typename Ctx>
Result<typename Ctx::InstrT> makeStringConcat(Ctx&, Index);
template<typename Ctx> Result<typename Ctx::InstrT> makeStringEq(Ctx&, Index);
template<typename Ctx>
Result<typename Ctx::InstrT> makeStringEq(Ctx&, Index, StringEqOp);
template<typename Ctx>
Result<typename Ctx::InstrT> makeStringAs(Ctx&, Index, StringAsOp op);
template<typename Ctx>
Expand Down Expand Up @@ -3589,7 +3590,7 @@ Result<typename Ctx::InstrT> makeStringConcat(Ctx& ctx, Index pos) {
}

template<typename Ctx>
Result<typename Ctx::InstrT> makeStringEq(Ctx& ctx, Index pos) {
Result<typename Ctx::InstrT> makeStringEq(Ctx& ctx, Index pos, StringEqOp op) {
return ctx.in.err("unimplemented instruction");
}

Expand Down
25 changes: 23 additions & 2 deletions test/lit/strings.wast
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@

;; CHECK: (type $stringref_=>_none (func (param stringref)))

;; CHECK: (type $stringref_stringview_wtf8_stringview_wtf16_stringview_iter_=>_none (func (param stringref stringview_wtf8 stringview_wtf16 stringview_iter)))

;; CHECK: (type $stringref_stringref_=>_none (func (param stringref stringref)))

;; CHECK: (type $stringref_stringview_wtf8_stringview_wtf16_stringview_iter_=>_none (func (param stringref stringview_wtf8 stringview_wtf16 stringview_iter)))

;; CHECK: (type $array (array (mut i8)))
(type $array (array_subtype (mut i8) data))
;; CHECK: (type $array16 (array (mut i16)))
Expand Down Expand Up @@ -250,6 +250,27 @@
)
)

;; CHECK: (func $string.compare (type $stringref_stringref_=>_none) (param $a stringref) (param $b stringref)
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (i32.eqz
;; CHECK-NEXT: (string.compare
;; CHECK-NEXT: (local.get $a)
;; CHECK-NEXT: (local.get $b)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: )
(func $string.compare (param $a stringref) (param $b stringref)
(drop
(i32.eqz ;; validate the output is an i32
(string.compare
(local.get $a)
(local.get $b)
)
)
)
)

;; CHECK: (func $string.is_usv_sequence (type $stringref_=>_none) (param $ref stringref)
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (i32.eqz
Expand Down