Skip to content

Commit 88b6186

Browse files
aheejinaheejin
authored
[WebAssembly] Tidy up wasm-target-features.c (#89778)
This tidies up `wasm-target-features.c` cosmetically: - Sorts the feature tests alphabetically - Adds a space after colons
1 parent c8c1e4e commit 88b6186

File tree

2 files changed

+73
-74
lines changed

2 files changed

+73
-74
lines changed

‎clang/lib/Basic/Targets/WebAssembly.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -148,18 +148,18 @@ bool WebAssemblyTargetInfo::initFeatureMap(
148148
llvm::StringMap<bool> &Features, DiagnosticsEngine &Diags, StringRef CPU,
149149
const std::vector<std::string> &FeaturesVec) const {
150150
if (CPU == "bleeding-edge") {
151-
Features["nontrapping-fptoint"] = true;
152-
Features["sign-ext"] = true;
153-
Features["bulk-memory"] = true;
154151
Features["atomics"] = true;
152+
Features["bulk-memory"] = true;
153+
Features["multimemory"] = true;
155154
Features["mutable-globals"] = true;
156-
Features["tail-call"] = true;
155+
Features["nontrapping-fptoint"] = true;
157156
Features["reference-types"] = true;
158-
Features["multimemory"] = true;
157+
Features["sign-ext"] = true;
158+
Features["tail-call"] = true;
159159
setSIMDLevel(Features, SIMD128, true);
160160
} else if (CPU == "generic") {
161-
Features["sign-ext"] = true;
162161
Features["mutable-globals"] = true;
162+
Features["sign-ext"] = true;
163163
}
164164

165165
return TargetInfo::initFeatureMap(Features, Diags, CPU, FeaturesVec);

‎clang/test/Preprocessor/wasm-target-features.c

Lines changed: 67 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,29 @@
11
// RUN: %clang -E -dM %s -o - 2>&1 \
2-
// RUN: -target wasm32-unknown-unknown -msimd128 \
3-
// RUN: | FileCheck %s -check-prefix=SIMD128
4-
// RUN: %clang -E -dM %s -o - 2>&1 \
5-
// RUN: -target wasm64-unknown-unknown -msimd128 \
6-
// RUN: | FileCheck %s -check-prefix=SIMD128
7-
//
8-
// SIMD128:#define __wasm_simd128__ 1{{$}}
9-
10-
// RUN: %clang -E -dM %s -o - 2>&1 \
11-
// RUN: -target wasm32-unknown-unknown -mrelaxed-simd \
12-
// RUN: | FileCheck %s -check-prefix=RELAXED-SIMD
2+
// RUN: -target wasm32-unknown-unknown -matomics \
3+
// RUN: | FileCheck %s -check-prefix=ATOMICS
134
// RUN: %clang -E -dM %s -o - 2>&1 \
14-
// RUN: -target wasm64-unknown-unknown -mrelaxed-simd \
15-
// RUN: | FileCheck %s -check-prefix=RELAXED-SIMD
5+
// RUN: -target wasm64-unknown-unknown -matomics \
6+
// RUN: | FileCheck %s -check-prefix=ATOMICS
167
//
17-
// RELAXED-SIMD:#define __wasm_relaxed_simd__ 1{{$}}
8+
// ATOMICS: #define __wasm_atomics__ 1{{$}}
189

1910
// RUN: %clang -E -dM %s -o - 2>&1 \
20-
// RUN: -target wasm32-unknown-unknown -mnontrapping-fptoint \
21-
// RUN: | FileCheck %s -check-prefix=NONTRAPPING-FPTOINT
11+
// RUN: -target wasm32-unknown-unknown -pthread \
12+
// RUN: | FileCheck %s -check-prefix=PTHREAD
2213
// RUN: %clang -E -dM %s -o - 2>&1 \
23-
// RUN: -target wasm64-unknown-unknown -mnontrapping-fptoint \
24-
// RUN: | FileCheck %s -check-prefix=NONTRAPPING-FPTOINT
14+
// RUN: -target wasm64-unknown-unknown -pthread \
15+
// RUN: | FileCheck %s -check-prefix=PTHREAD
2516
//
26-
// NONTRAPPING-FPTOINT:#define __wasm_nontrapping_fptoint__ 1{{$}}
17+
// PTHREAD: #define __wasm_atomics__ 1{{$}}
2718

2819
// RUN: %clang -E -dM %s -o - 2>&1 \
29-
// RUN: -target wasm32-unknown-unknown -msign-ext \
30-
// RUN: | FileCheck %s -check-prefix=SIGN-EXT
20+
// RUN: -target wasm32-unknown-unknown -mbulk-memory \
21+
// RUN: | FileCheck %s -check-prefix=BULK-MEMORY
3122
// RUN: %clang -E -dM %s -o - 2>&1 \
32-
// RUN: -target wasm64-unknown-unknown -msign-ext \
33-
// RUN: | FileCheck %s -check-prefix=SIGN-EXT
23+
// RUN: -target wasm64-unknown-unknown -mbulk-memory \
24+
// RUN: | FileCheck %s -check-prefix=BULK-MEMORY
3425
//
35-
// SIGN-EXT:#define __wasm_sign_ext__ 1{{$}}
26+
// BULK-MEMORY: #define __wasm_bulk_memory__ 1{{$}}
3627

3728
// RUN: %clang -E -dM %s -o - 2>&1 \
3829
// RUN: -target wasm32-unknown-unknown -mexception-handling \
@@ -41,34 +32,34 @@
4132
// RUN: -target wasm64-unknown-unknown -mexception-handling \
4233
// RUN: | FileCheck %s -check-prefix=EXCEPTION-HANDLING
4334
//
44-
// EXCEPTION-HANDLING:#define __wasm_exception_handling__ 1{{$}}
35+
// EXCEPTION-HANDLING: #define __wasm_exception_handling__ 1{{$}}
4536

4637
// RUN: %clang -E -dM %s -o - 2>&1 \
47-
// RUN: -target wasm32-unknown-unknown -mbulk-memory \
48-
// RUN: | FileCheck %s -check-prefix=BULK-MEMORY
38+
// RUN: -target wasm32-unknown-unknown -mextended-const \
39+
// RUN: | FileCheck %s -check-prefix=EXTENDED-CONST
4940
// RUN: %clang -E -dM %s -o - 2>&1 \
50-
// RUN: -target wasm64-unknown-unknown -mbulk-memory \
51-
// RUN: | FileCheck %s -check-prefix=BULK-MEMORY
41+
// RUN: -target wasm64-unknown-unknown -mextended-const \
42+
// RUN: | FileCheck %s -check-prefix=EXTENDED-CONST
5243
//
53-
// BULK-MEMORY:#define __wasm_bulk_memory__ 1{{$}}
44+
// EXTENDED-CONST: #define __wasm_extended_const__ 1{{$}}
5445

5546
// RUN: %clang -E -dM %s -o - 2>&1 \
56-
// RUN: -target wasm32-unknown-unknown -matomics \
57-
// RUN: | FileCheck %s -check-prefix=ATOMICS
47+
// RUN: -target wasm32-unknown-unknown -mmultimemory \
48+
// RUN: | FileCheck %s -check-prefix=MULTIMEMORY
5849
// RUN: %clang -E -dM %s -o - 2>&1 \
59-
// RUN: -target wasm64-unknown-unknown -matomics \
60-
// RUN: | FileCheck %s -check-prefix=ATOMICS
50+
// RUN: -target wasm64-unknown-unknown -mmultimemory \
51+
// RUN: | FileCheck %s -check-prefix=MULTIMEMORY
6152
//
62-
// ATOMICS:#define __wasm_atomics__ 1{{$}}
53+
// MULTIMEMORY: #define __wasm_multimemory__ 1{{$}}
6354

6455
// RUN: %clang -E -dM %s -o - 2>&1 \
65-
// RUN: -target wasm32-unknown-unknown -pthread \
66-
// RUN: | FileCheck %s -check-prefix=PTHREAD
56+
// RUN: -target wasm32-unknown-unknown -mmultivalue \
57+
// RUN: | FileCheck %s -check-prefix=MULTIVALUE
6758
// RUN: %clang -E -dM %s -o - 2>&1 \
68-
// RUN: -target wasm64-unknown-unknown -pthread \
69-
// RUN: | FileCheck %s -check-prefix=PTHREAD
59+
// RUN: -target wasm64-unknown-unknown -mmultivalue \
60+
// RUN: | FileCheck %s -check-prefix=MULTIVALUE
7061
//
71-
// PTHREAD:#define __wasm_atomics__ 1{{$}}
62+
// MULTIVALUE: #define __wasm_multivalue__ 1{{$}}
7263

7364
// RUN: %clang -E -dM %s -o - 2>&1 \
7465
// RUN: -target wasm32-unknown-unknown -mmutable-globals \
@@ -77,53 +68,61 @@
7768
// RUN: -target wasm64-unknown-unknown -mmutable-globals \
7869
// RUN: | FileCheck %s -check-prefix=MUTABLE-GLOBALS
7970
//
80-
// MUTABLE-GLOBALS:#define __wasm_mutable_globals__ 1{{$}}
71+
// MUTABLE-GLOBALS: #define __wasm_mutable_globals__ 1{{$}}
8172

8273
// RUN: %clang -E -dM %s -o - 2>&1 \
83-
// RUN: -target wasm32-unknown-unknown -mmultivalue \
84-
// RUN: | FileCheck %s -check-prefix=MULTIVALUE
74+
// RUN: -target wasm32-unknown-unknown -mnontrapping-fptoint \
75+
// RUN: | FileCheck %s -check-prefix=NONTRAPPING-FPTOINT
8576
// RUN: %clang -E -dM %s -o - 2>&1 \
86-
// RUN: -target wasm64-unknown-unknown -mmultivalue \
87-
// RUN: | FileCheck %s -check-prefix=MULTIVALUE
77+
// RUN: -target wasm64-unknown-unknown -mnontrapping-fptoint \
78+
// RUN: | FileCheck %s -check-prefix=NONTRAPPING-FPTOINT
8879
//
89-
// MULTIVALUE:#define __wasm_multivalue__ 1{{$}}
80+
// NONTRAPPING-FPTOINT: #define __wasm_nontrapping_fptoint__ 1{{$}}
9081

91-
// RUN: %clang -E -dM %s -o - 2>&1 \
92-
// RUN: -target wasm32-unknown-unknown -mtail-call \
93-
// RUN: | FileCheck %s -check-prefix=TAIL-CALL
94-
// RUN: %clang -E -dM %s -o - 2>&1 \
95-
// RUN: -target wasm64-unknown-unknown -mtail-call \
96-
// RUN: | FileCheck %s -check-prefix=TAIL-CALL
97-
//
98-
// TAIL-CALL:#define __wasm_tail_call__ 1{{$}}
99-
//
10082
// RUN: %clang -E -dM %s -o - 2>&1 \
10183
// RUN: -target wasm32-unknown-unknown -mreference-types \
10284
// RUN: | FileCheck %s -check-prefix=REFERENCE-TYPES
10385
// RUN: %clang -E -dM %s -o - 2>&1 \
10486
// RUN: -target wasm64-unknown-unknown -mreference-types \
10587
// RUN: | FileCheck %s -check-prefix=REFERENCE-TYPES
10688
//
107-
// REFERENCE-TYPES:#define __wasm_reference_types__ 1{{$}}
108-
//
89+
// REFERENCE-TYPES: #define __wasm_reference_types__ 1{{$}}
90+
10991
// RUN: %clang -E -dM %s -o - 2>&1 \
110-
// RUN: -target wasm32-unknown-unknown -mextended-const \
111-
// RUN: | FileCheck %s -check-prefix=EXTENDED-CONST
92+
// RUN: -target wasm32-unknown-unknown -mrelaxed-simd \
93+
// RUN: | FileCheck %s -check-prefix=RELAXED-SIMD
11294
// RUN: %clang -E -dM %s -o - 2>&1 \
113-
// RUN: -target wasm64-unknown-unknown -mextended-const \
114-
// RUN: | FileCheck %s -check-prefix=EXTENDED-CONST
95+
// RUN: -target wasm64-unknown-unknown -mrelaxed-simd \
96+
// RUN: | FileCheck %s -check-prefix=RELAXED-SIMD
11597
//
116-
// EXTENDED-CONST:#define __wasm_extended_const__ 1{{$}}
98+
// RELAXED-SIMD: #define __wasm_relaxed_simd__ 1{{$}}
99+
100+
// RUN: %clang -E -dM %s -o - 2>&1 \
101+
// RUN: -target wasm32-unknown-unknown -msign-ext \
102+
// RUN: | FileCheck %s -check-prefix=SIGN-EXT
103+
// RUN: %clang -E -dM %s -o - 2>&1 \
104+
// RUN: -target wasm64-unknown-unknown -msign-ext \
105+
// RUN: | FileCheck %s -check-prefix=SIGN-EXT
117106
//
107+
// SIGN-EXT: #define __wasm_sign_ext__ 1{{$}}
108+
118109
// RUN: %clang -E -dM %s -o - 2>&1 \
119-
// RUN: -target wasm32-unknown-unknown -mmultimemory \
120-
// RUN: | FileCheck %s -check-prefix=MULTIMEMORY
110+
// RUN: -target wasm32-unknown-unknown -msimd128 \
111+
// RUN: | FileCheck %s -check-prefix=SIMD128
121112
// RUN: %clang -E -dM %s -o - 2>&1 \
122-
// RUN: -target wasm64-unknown-unknown -mmultimemory \
123-
// RUN: | FileCheck %s -check-prefix=MULTIMEMORY
113+
// RUN: -target wasm64-unknown-unknown -msimd128 \
114+
// RUN: | FileCheck %s -check-prefix=SIMD128
124115
//
125-
// MULTIMEMORY:#define __wasm_multimemory__ 1{{$}}
116+
// SIMD128: #define __wasm_simd128__ 1{{$}}
117+
118+
// RUN: %clang -E -dM %s -o - 2>&1 \
119+
// RUN: -target wasm32-unknown-unknown -mtail-call \
120+
// RUN: | FileCheck %s -check-prefix=TAIL-CALL
121+
// RUN: %clang -E -dM %s -o - 2>&1 \
122+
// RUN: -target wasm64-unknown-unknown -mtail-call \
123+
// RUN: | FileCheck %s -check-prefix=TAIL-CALL
126124
//
125+
// TAIL-CALL: #define __wasm_tail_call__ 1{{$}}
127126

128127
// RUN: %clang -E -dM %s -o - 2>&1 \
129128
// RUN: -target wasm32-unknown-unknown -mcpu=mvp \
@@ -211,4 +210,4 @@
211210
// RUN: -target wasm64-unknown-unknown -mcpu=bleeding-edge -mno-simd128 \
212211
// RUN: | FileCheck %s -check-prefix=BLEEDING-EDGE-NO-SIMD128
213212
//
214-
// BLEEDING-EDGE-NO-SIMD128-NOT:#define __wasm_simd128__
213+
// BLEEDING-EDGE-NO-SIMD128-NOT: #define __wasm_simd128__ 1{{$}}

0 commit comments

Comments
 (0)