Skip to content

Commit 315cc06

Browse files
jfbastienjfbastien
committedAug 7, 2015
WebAssembly: textual emission uses expected opcode names
Summary: WebAssembly's tablegen instructions have the names WebAssembly expects, but by LLVM convention they're uppercase and suffixed with their type after an underscore. Leave the C++ code that way, but print outt he names WebAssembly expects (lowercase, no type). We could teach tablegen to do this later, maybe by using `!cast<string>(node)` in the .td files. Reviewers: sunfish Subscribers: jfb, llvm-commits Differential Revision: http://reviews.llvm.org/D11776 llvm-svn: 244305
·
llvmorg-21-initllvmorg-3.8.0-rc1
1 parent f594fca commit 315cc06

File tree

3 files changed

+45
-44
lines changed

3 files changed

+45
-44
lines changed
 

‎llvm/lib/Target/WebAssembly/WebAssemblyAsmPrinter.cpp

+13-12
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,17 @@ class WebAssemblyAsmPrinter final : public AsmPrinter {
7474

7575
//===----------------------------------------------------------------------===//
7676

77+
// Untyped, lower-case version of the opcode's name matching the names
78+
// WebAssembly opcodes are expected to have. The tablegen names are uppercase
79+
// and suffixed with their type (after an underscore).
80+
static SmallString<32> Name(const WebAssemblyInstrInfo *TII,
81+
const MachineInstr *MI) {
82+
std::string N(StringRef(TII->getName(MI->getOpcode())).lower());
83+
std::string::size_type End = N.find('_');
84+
End = std::string::npos == End ? N.length() : End;
85+
return SmallString<32>(&N[0], &N[End]);
86+
}
87+
7788
void WebAssemblyAsmPrinter::EmitInstruction(const MachineInstr *MI) {
7889
SmallString<128> Str;
7990
raw_svector_ostream OS(Str);
@@ -96,21 +107,11 @@ void WebAssemblyAsmPrinter::EmitInstruction(const MachineInstr *MI) {
96107
case WebAssembly::ARGUMENT_Int64:
97108
case WebAssembly::ARGUMENT_Float32:
98109
case WebAssembly::ARGUMENT_Float64:
99-
OS << "argument " << MI->getOperand(1).getImm();
110+
OS << Name(TII, MI) << ' ' << MI->getOperand(1).getImm();
100111
PrintOperands = false;
101112
break;
102-
case WebAssembly::RETURN_Int32:
103-
case WebAssembly::RETURN_Int64:
104-
case WebAssembly::RETURN_Float32:
105-
case WebAssembly::RETURN_Float64:
106-
case WebAssembly::RETURN_VOID:
107-
// FIXME This is here only so "return" prints nicely, instead of printing
108-
// the isel name. Other operations have the same problem, fix this in
109-
// a generic way instead.
110-
OS << "return";
111-
break;
112113
default:
113-
OS << TII->getName(MI->getOpcode());
114+
OS << Name(TII, MI);
114115
break;
115116
}
116117

‎llvm/test/CodeGen/WebAssembly/integer32.ll

+16-16
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ declare i32 @llvm.ctpop.i32(i32)
1212
; CHECK-LABEL: add32:
1313
; CHECK-NEXT: (setlocal @0 (argument 1))
1414
; CHECK-NEXT: (setlocal @1 (argument 0))
15-
; CHECK-NEXT: (setlocal @2 (ADD_I32 @1 @0))
15+
; CHECK-NEXT: (setlocal @2 (add @1 @0))
1616
; CHECK-NEXT: (return @2)
1717
define i32 @add32(i32 %x, i32 %y) {
1818
%a = add i32 %x, %y
@@ -22,7 +22,7 @@ define i32 @add32(i32 %x, i32 %y) {
2222
; CHECK-LABEL: sub32:
2323
; CHECK-NEXT: (setlocal @0 (argument 1))
2424
; CHECK-NEXT: (setlocal @1 (argument 0))
25-
; CHECK-NEXT: (setlocal @2 (SUB_I32 @1 @0))
25+
; CHECK-NEXT: (setlocal @2 (sub @1 @0))
2626
; CHECK-NEXT: (return @2)
2727
define i32 @sub32(i32 %x, i32 %y) {
2828
%a = sub i32 %x, %y
@@ -32,7 +32,7 @@ define i32 @sub32(i32 %x, i32 %y) {
3232
; CHECK-LABEL: mul32:
3333
; CHECK-NEXT: (setlocal @0 (argument 1))
3434
; CHECK-NEXT: (setlocal @1 (argument 0))
35-
; CHECK-NEXT: (setlocal @2 (MUL_I32 @1 @0))
35+
; CHECK-NEXT: (setlocal @2 (mul @1 @0))
3636
; CHECK-NEXT: (return @2)
3737
define i32 @mul32(i32 %x, i32 %y) {
3838
%a = mul i32 %x, %y
@@ -42,7 +42,7 @@ define i32 @mul32(i32 %x, i32 %y) {
4242
; CHECK-LABEL: sdiv32:
4343
; CHECK-NEXT: (setlocal @0 (argument 1))
4444
; CHECK-NEXT: (setlocal @1 (argument 0))
45-
; CHECK-NEXT: (setlocal @2 (SDIV_I32 @1 @0))
45+
; CHECK-NEXT: (setlocal @2 (sdiv @1 @0))
4646
; CHECK-NEXT: (return @2)
4747
define i32 @sdiv32(i32 %x, i32 %y) {
4848
%a = sdiv i32 %x, %y
@@ -52,7 +52,7 @@ define i32 @sdiv32(i32 %x, i32 %y) {
5252
; CHECK-LABEL: udiv32:
5353
; CHECK-NEXT: (setlocal @0 (argument 1))
5454
; CHECK-NEXT: (setlocal @1 (argument 0))
55-
; CHECK-NEXT: (setlocal @2 (UDIV_I32 @1 @0))
55+
; CHECK-NEXT: (setlocal @2 (udiv @1 @0))
5656
; CHECK-NEXT: (return @2)
5757
define i32 @udiv32(i32 %x, i32 %y) {
5858
%a = udiv i32 %x, %y
@@ -62,7 +62,7 @@ define i32 @udiv32(i32 %x, i32 %y) {
6262
; CHECK-LABEL: srem32:
6363
; CHECK-NEXT: (setlocal @0 (argument 1))
6464
; CHECK-NEXT: (setlocal @1 (argument 0))
65-
; CHECK-NEXT: (setlocal @2 (SREM_I32 @1 @0))
65+
; CHECK-NEXT: (setlocal @2 (srem @1 @0))
6666
; CHECK-NEXT: (return @2)
6767
define i32 @srem32(i32 %x, i32 %y) {
6868
%a = srem i32 %x, %y
@@ -72,7 +72,7 @@ define i32 @srem32(i32 %x, i32 %y) {
7272
; CHECK-LABEL: urem32:
7373
; CHECK-NEXT: (setlocal @0 (argument 1))
7474
; CHECK-NEXT: (setlocal @1 (argument 0))
75-
; CHECK-NEXT: (setlocal @2 (UREM_I32 @1 @0))
75+
; CHECK-NEXT: (setlocal @2 (urem @1 @0))
7676
; CHECK-NEXT: (return @2)
7777
define i32 @urem32(i32 %x, i32 %y) {
7878
%a = urem i32 %x, %y
@@ -82,7 +82,7 @@ define i32 @urem32(i32 %x, i32 %y) {
8282
; CHECK-LABEL: and32:
8383
; CHECK-NEXT: (setlocal @0 (argument 1))
8484
; CHECK-NEXT: (setlocal @1 (argument 0))
85-
; CHECK-NEXT: (setlocal @2 (AND_I32 @1 @0))
85+
; CHECK-NEXT: (setlocal @2 (and @1 @0))
8686
; CHECK-NEXT: (return @2)
8787
define i32 @and32(i32 %x, i32 %y) {
8888
%a = and i32 %x, %y
@@ -92,7 +92,7 @@ define i32 @and32(i32 %x, i32 %y) {
9292
; CHECK-LABEL: ior32:
9393
; CHECK-NEXT: (setlocal @0 (argument 1))
9494
; CHECK-NEXT: (setlocal @1 (argument 0))
95-
; CHECK-NEXT: (setlocal @2 (IOR_I32 @1 @0))
95+
; CHECK-NEXT: (setlocal @2 (ior @1 @0))
9696
; CHECK-NEXT: (return @2)
9797
define i32 @ior32(i32 %x, i32 %y) {
9898
%a = or i32 %x, %y
@@ -102,7 +102,7 @@ define i32 @ior32(i32 %x, i32 %y) {
102102
; CHECK-LABEL: xor32:
103103
; CHECK-NEXT: (setlocal @0 (argument 1))
104104
; CHECK-NEXT: (setlocal @1 (argument 0))
105-
; CHECK-NEXT: (setlocal @2 (XOR_I32 @1 @0))
105+
; CHECK-NEXT: (setlocal @2 (xor @1 @0))
106106
; CHECK-NEXT: (return @2)
107107
define i32 @xor32(i32 %x, i32 %y) {
108108
%a = xor i32 %x, %y
@@ -112,7 +112,7 @@ define i32 @xor32(i32 %x, i32 %y) {
112112
; CHECK-LABEL: shl32:
113113
; CHECK-NEXT: (setlocal @0 (argument 1))
114114
; CHECK-NEXT: (setlocal @1 (argument 0))
115-
; CHECK-NEXT: (setlocal @2 (SHL_I32 @1 @0))
115+
; CHECK-NEXT: (setlocal @2 (shl @1 @0))
116116
; CHECK-NEXT: (return @2)
117117
define i32 @shl32(i32 %x, i32 %y) {
118118
%a = shl i32 %x, %y
@@ -122,7 +122,7 @@ define i32 @shl32(i32 %x, i32 %y) {
122122
; CHECK-LABEL: shr32:
123123
; CHECK-NEXT: (setlocal @0 (argument 1))
124124
; CHECK-NEXT: (setlocal @1 (argument 0))
125-
; CHECK-NEXT: (setlocal @2 (SHR_I32 @1 @0))
125+
; CHECK-NEXT: (setlocal @2 (shr @1 @0))
126126
; CHECK-NEXT: (return @2)
127127
define i32 @shr32(i32 %x, i32 %y) {
128128
%a = lshr i32 %x, %y
@@ -132,7 +132,7 @@ define i32 @shr32(i32 %x, i32 %y) {
132132
; CHECK-LABEL: sar32:
133133
; CHECK-NEXT: (setlocal @0 (argument 1))
134134
; CHECK-NEXT: (setlocal @1 (argument 0))
135-
; CHECK-NEXT: (setlocal @2 (SAR_I32 @1 @0))
135+
; CHECK-NEXT: (setlocal @2 (sar @1 @0))
136136
; CHECK-NEXT: (return @2)
137137
define i32 @sar32(i32 %x, i32 %y) {
138138
%a = ashr i32 %x, %y
@@ -141,7 +141,7 @@ define i32 @sar32(i32 %x, i32 %y) {
141141

142142
; CHECK-LABEL: clz32:
143143
; CHECK-NEXT: (setlocal @0 (argument 0))
144-
; CHECK-NEXT: (setlocal @1 (CLZ_I32 @0))
144+
; CHECK-NEXT: (setlocal @1 (clz @0))
145145
; CHECK-NEXT: (return @1)
146146
define i32 @clz32(i32 %x) {
147147
%a = call i32 @llvm.ctlz.i32(i32 %x, i1 false)
@@ -150,7 +150,7 @@ define i32 @clz32(i32 %x) {
150150

151151
; CHECK-LABEL: ctz32:
152152
; CHECK-NEXT: (setlocal @0 (argument 0))
153-
; CHECK-NEXT: (setlocal @1 (CTZ_I32 @0))
153+
; CHECK-NEXT: (setlocal @1 (ctz @0))
154154
; CHECK-NEXT: (return @1)
155155
define i32 @ctz32(i32 %x) {
156156
%a = call i32 @llvm.cttz.i32(i32 %x, i1 false)
@@ -159,7 +159,7 @@ define i32 @ctz32(i32 %x) {
159159

160160
; CHECK-LABEL: popcnt32:
161161
; CHECK-NEXT: (setlocal @0 (argument 0))
162-
; CHECK-NEXT: (setlocal @1 (POPCNT_I32 @0))
162+
; CHECK-NEXT: (setlocal @1 (popcnt @0))
163163
; CHECK-NEXT: (return @1)
164164
define i32 @popcnt32(i32 %x) {
165165
%a = call i32 @llvm.ctpop.i32(i32 %x)

‎llvm/test/CodeGen/WebAssembly/integer64.ll

+16-16
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ declare i64 @llvm.ctpop.i64(i64)
1212
; CHECK-LABEL: add64:
1313
; CHECK-NEXT: (setlocal @0 (argument 1))
1414
; CHECK-NEXT: (setlocal @1 (argument 0))
15-
; CHECK-NEXT: (setlocal @2 (ADD_I64 @1 @0))
15+
; CHECK-NEXT: (setlocal @2 (add @1 @0))
1616
; CHECK-NEXT: (return @2)
1717
define i64 @add64(i64 %x, i64 %y) {
1818
%a = add i64 %x, %y
@@ -22,7 +22,7 @@ define i64 @add64(i64 %x, i64 %y) {
2222
; CHECK-LABEL: sub64:
2323
; CHECK-NEXT: (setlocal @0 (argument 1))
2424
; CHECK-NEXT: (setlocal @1 (argument 0))
25-
; CHECK-NEXT: (setlocal @2 (SUB_I64 @1 @0))
25+
; CHECK-NEXT: (setlocal @2 (sub @1 @0))
2626
; CHECK-NEXT: (return @2)
2727
define i64 @sub64(i64 %x, i64 %y) {
2828
%a = sub i64 %x, %y
@@ -32,7 +32,7 @@ define i64 @sub64(i64 %x, i64 %y) {
3232
; CHECK-LABEL: mul64:
3333
; CHECK-NEXT: (setlocal @0 (argument 1))
3434
; CHECK-NEXT: (setlocal @1 (argument 0))
35-
; CHECK-NEXT: (setlocal @2 (MUL_I64 @1 @0))
35+
; CHECK-NEXT: (setlocal @2 (mul @1 @0))
3636
; CHECK-NEXT: (return @2)
3737
define i64 @mul64(i64 %x, i64 %y) {
3838
%a = mul i64 %x, %y
@@ -42,7 +42,7 @@ define i64 @mul64(i64 %x, i64 %y) {
4242
; CHECK-LABEL: sdiv64:
4343
; CHECK-NEXT: (setlocal @0 (argument 1))
4444
; CHECK-NEXT: (setlocal @1 (argument 0))
45-
; CHECK-NEXT: (setlocal @2 (SDIV_I64 @1 @0))
45+
; CHECK-NEXT: (setlocal @2 (sdiv @1 @0))
4646
; CHECK-NEXT: (return @2)
4747
define i64 @sdiv64(i64 %x, i64 %y) {
4848
%a = sdiv i64 %x, %y
@@ -52,7 +52,7 @@ define i64 @sdiv64(i64 %x, i64 %y) {
5252
; CHECK-LABEL: udiv64:
5353
; CHECK-NEXT: (setlocal @0 (argument 1))
5454
; CHECK-NEXT: (setlocal @1 (argument 0))
55-
; CHECK-NEXT: (setlocal @2 (UDIV_I64 @1 @0))
55+
; CHECK-NEXT: (setlocal @2 (udiv @1 @0))
5656
; CHECK-NEXT: (return @2)
5757
define i64 @udiv64(i64 %x, i64 %y) {
5858
%a = udiv i64 %x, %y
@@ -62,7 +62,7 @@ define i64 @udiv64(i64 %x, i64 %y) {
6262
; CHECK-LABEL: srem64:
6363
; CHECK-NEXT: (setlocal @0 (argument 1))
6464
; CHECK-NEXT: (setlocal @1 (argument 0))
65-
; CHECK-NEXT: (setlocal @2 (SREM_I64 @1 @0))
65+
; CHECK-NEXT: (setlocal @2 (srem @1 @0))
6666
; CHECK-NEXT: (return @2)
6767
define i64 @srem64(i64 %x, i64 %y) {
6868
%a = srem i64 %x, %y
@@ -72,7 +72,7 @@ define i64 @srem64(i64 %x, i64 %y) {
7272
; CHECK-LABEL: urem64:
7373
; CHECK-NEXT: (setlocal @0 (argument 1))
7474
; CHECK-NEXT: (setlocal @1 (argument 0))
75-
; CHECK-NEXT: (setlocal @2 (UREM_I64 @1 @0))
75+
; CHECK-NEXT: (setlocal @2 (urem @1 @0))
7676
; CHECK-NEXT: (return @2)
7777
define i64 @urem64(i64 %x, i64 %y) {
7878
%a = urem i64 %x, %y
@@ -82,7 +82,7 @@ define i64 @urem64(i64 %x, i64 %y) {
8282
; CHECK-LABEL: and64:
8383
; CHECK-NEXT: (setlocal @0 (argument 1))
8484
; CHECK-NEXT: (setlocal @1 (argument 0))
85-
; CHECK-NEXT: (setlocal @2 (AND_I64 @1 @0))
85+
; CHECK-NEXT: (setlocal @2 (and @1 @0))
8686
; CHECK-NEXT: (return @2)
8787
define i64 @and64(i64 %x, i64 %y) {
8888
%a = and i64 %x, %y
@@ -92,7 +92,7 @@ define i64 @and64(i64 %x, i64 %y) {
9292
; CHECK-LABEL: ior64:
9393
; CHECK-NEXT: (setlocal @0 (argument 1))
9494
; CHECK-NEXT: (setlocal @1 (argument 0))
95-
; CHECK-NEXT: (setlocal @2 (IOR_I64 @1 @0))
95+
; CHECK-NEXT: (setlocal @2 (ior @1 @0))
9696
; CHECK-NEXT: (return @2)
9797
define i64 @ior64(i64 %x, i64 %y) {
9898
%a = or i64 %x, %y
@@ -102,7 +102,7 @@ define i64 @ior64(i64 %x, i64 %y) {
102102
; CHECK-LABEL: xor64:
103103
; CHECK-NEXT: (setlocal @0 (argument 1))
104104
; CHECK-NEXT: (setlocal @1 (argument 0))
105-
; CHECK-NEXT: (setlocal @2 (XOR_I64 @1 @0))
105+
; CHECK-NEXT: (setlocal @2 (xor @1 @0))
106106
; CHECK-NEXT: (return @2)
107107
define i64 @xor64(i64 %x, i64 %y) {
108108
%a = xor i64 %x, %y
@@ -112,7 +112,7 @@ define i64 @xor64(i64 %x, i64 %y) {
112112
; CHECK-LABEL: shl64:
113113
; CHECK-NEXT: (setlocal @0 (argument 1))
114114
; CHECK-NEXT: (setlocal @1 (argument 0))
115-
; CHECK-NEXT: (setlocal @2 (SHL_I64 @1 @0))
115+
; CHECK-NEXT: (setlocal @2 (shl @1 @0))
116116
; CHECK-NEXT: (return @2)
117117
define i64 @shl64(i64 %x, i64 %y) {
118118
%a = shl i64 %x, %y
@@ -122,7 +122,7 @@ define i64 @shl64(i64 %x, i64 %y) {
122122
; CHECK-LABEL: shr64:
123123
; CHECK-NEXT: (setlocal @0 (argument 1))
124124
; CHECK-NEXT: (setlocal @1 (argument 0))
125-
; CHECK-NEXT: (setlocal @2 (SHR_I64 @1 @0))
125+
; CHECK-NEXT: (setlocal @2 (shr @1 @0))
126126
; CHECK-NEXT: (return @2)
127127
define i64 @shr64(i64 %x, i64 %y) {
128128
%a = lshr i64 %x, %y
@@ -132,7 +132,7 @@ define i64 @shr64(i64 %x, i64 %y) {
132132
; CHECK-LABEL: sar64:
133133
; CHECK-NEXT: (setlocal @0 (argument 1))
134134
; CHECK-NEXT: (setlocal @1 (argument 0))
135-
; CHECK-NEXT: (setlocal @2 (SAR_I64 @1 @0))
135+
; CHECK-NEXT: (setlocal @2 (sar @1 @0))
136136
; CHECK-NEXT: (return @2)
137137
define i64 @sar64(i64 %x, i64 %y) {
138138
%a = ashr i64 %x, %y
@@ -141,7 +141,7 @@ define i64 @sar64(i64 %x, i64 %y) {
141141

142142
; CHECK-LABEL: clz64:
143143
; CHECK-NEXT: (setlocal @0 (argument 0))
144-
; CHECK-NEXT: (setlocal @1 (CLZ_I64 @0))
144+
; CHECK-NEXT: (setlocal @1 (clz @0))
145145
; CHECK-NEXT: (return @1)
146146
define i64 @clz64(i64 %x) {
147147
%a = call i64 @llvm.ctlz.i64(i64 %x, i1 false)
@@ -150,7 +150,7 @@ define i64 @clz64(i64 %x) {
150150

151151
; CHECK-LABEL: ctz64:
152152
; CHECK-NEXT: (setlocal @0 (argument 0))
153-
; CHECK-NEXT: (setlocal @1 (CTZ_I64 @0))
153+
; CHECK-NEXT: (setlocal @1 (ctz @0))
154154
; CHECK-NEXT: (return @1)
155155
define i64 @ctz64(i64 %x) {
156156
%a = call i64 @llvm.cttz.i64(i64 %x, i1 false)
@@ -159,7 +159,7 @@ define i64 @ctz64(i64 %x) {
159159

160160
; CHECK-LABEL: popcnt64:
161161
; CHECK-NEXT: (setlocal @0 (argument 0))
162-
; CHECK-NEXT: (setlocal @1 (POPCNT_I64 @0))
162+
; CHECK-NEXT: (setlocal @1 (popcnt @0))
163163
; CHECK-NEXT: (return @1)
164164
define i64 @popcnt64(i64 %x) {
165165
%a = call i64 @llvm.ctpop.i64(i64 %x)

0 commit comments

Comments
 (0)
Please sign in to comment.