Author: tlively Date: Thu May 23 10:26:47 2019 New Revision: 361516 URL: http://llvm.org/viewvc/llvm-project?rev=361516&view=rev Log: [WebAssembly] Add multivalue and tail-call target features
Summary: These features will both be implemented soon, so I thought I would save time by adding the boilerplate for both of them at the same time. Reviewers: aheejin Subscribers: dschuff, sbc100, jgravelle-google, hiraditya, sunfish, cfe-commits, llvm-commits Tags: #clang, #llvm Differential Revision: https://reviews.llvm.org/D62047 Modified: cfe/trunk/include/clang/Driver/Options.td cfe/trunk/lib/Basic/Targets/WebAssembly.cpp cfe/trunk/lib/Basic/Targets/WebAssembly.h cfe/trunk/test/Preprocessor/wasm-target-features.c Modified: cfe/trunk/include/clang/Driver/Options.td URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Driver/Options.td?rev=361516&r1=361515&r2=361516&view=diff ============================================================================== --- cfe/trunk/include/clang/Driver/Options.td (original) +++ cfe/trunk/include/clang/Driver/Options.td Thu May 23 10:26:47 2019 @@ -2185,6 +2185,10 @@ def mbulk_memory : Flag<["-"], "mbulk-me def mno_bulk_memory : Flag<["-"], "mno-bulk-memory">, Group<m_wasm_Features_Group>; def mmutable_globals : Flag<["-"], "mmutable-globals">, Group<m_wasm_Features_Group>; def mno_mutable_globals : Flag<["-"], "mno-mutable-globals">, Group<m_wasm_Features_Group>; +def mmultivalue : Flag<["-"], "mmultivalue">, Group<m_wasm_Features_Group>; +def mno_multivalue : Flag<["-"], "mno-multivalue">, Group<m_wasm_Features_Group>; +def mtail_call : Flag<["-"], "mtail-call">, Group<m_wasm_Features_Group>; +def mno_tail_call : Flag<["-"], "mno-tail-call">, Group<m_wasm_Features_Group>; def mamdgpu_debugger_abi : Joined<["-"], "mamdgpu-debugger-abi=">, Flags<[HelpHidden]>, Modified: cfe/trunk/lib/Basic/Targets/WebAssembly.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Basic/Targets/WebAssembly.cpp?rev=361516&r1=361515&r2=361516&view=diff ============================================================================== --- cfe/trunk/lib/Basic/Targets/WebAssembly.cpp (original) +++ cfe/trunk/lib/Basic/Targets/WebAssembly.cpp Thu May 23 10:26:47 2019 @@ -43,6 +43,8 @@ bool WebAssemblyTargetInfo::hasFeature(S .Case("bulk-memory", HasBulkMemory) .Case("atomics", HasAtomics) .Case("mutable-globals", HasMutableGlobals) + .Case("multivalue", HasMultivalue) + .Case("tail-call", HasTailCall) .Default(false); } @@ -74,6 +76,10 @@ void WebAssemblyTargetInfo::getTargetDef Builder.defineMacro("__wasm_atomics__"); if (HasMutableGlobals) Builder.defineMacro("__wasm_mutable_globals__"); + if (HasMultivalue) + Builder.defineMacro("__wasm_multivalue__"); + if (HasTailCall) + Builder.defineMacro("__wasm_tail_call__"); } void WebAssemblyTargetInfo::setSIMDLevel(llvm::StringMap<bool> &Features, @@ -116,6 +122,10 @@ bool WebAssemblyTargetInfo::initFeatureM Features["atomics"] = true; if (HasMutableGlobals) Features["mutable-globals"] = true; + if (HasMultivalue) + Features["multivalue"] = true; + if (HasTailCall) + Features["tail-call"] = true; return TargetInfo::initFeatureMap(Features, Diags, CPU, FeaturesVec); } @@ -187,6 +197,22 @@ bool WebAssemblyTargetInfo::handleTarget HasMutableGlobals = false; continue; } + if (Feature == "+multivalue") { + HasMultivalue = true; + continue; + } + if (Feature == "-multivalue") { + HasMultivalue = false; + continue; + } + if (Feature == "+tail-call") { + HasTailCall = true; + continue; + } + if (Feature == "-tail-call") { + HasTailCall = false; + continue; + } Diags.Report(diag::err_opt_not_valid_with_opt) << Feature << "-target-feature"; Modified: cfe/trunk/lib/Basic/Targets/WebAssembly.h URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Basic/Targets/WebAssembly.h?rev=361516&r1=361515&r2=361516&view=diff ============================================================================== --- cfe/trunk/lib/Basic/Targets/WebAssembly.h (original) +++ cfe/trunk/lib/Basic/Targets/WebAssembly.h Thu May 23 10:26:47 2019 @@ -36,6 +36,8 @@ class LLVM_LIBRARY_VISIBILITY WebAssembl bool HasBulkMemory = false; bool HasAtomics = false; bool HasMutableGlobals = false; + bool HasMultivalue = false; + bool HasTailCall = false; public: explicit WebAssemblyTargetInfo(const llvm::Triple &T, const TargetOptions &) Modified: cfe/trunk/test/Preprocessor/wasm-target-features.c URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Preprocessor/wasm-target-features.c?rev=361516&r1=361515&r2=361516&view=diff ============================================================================== --- cfe/trunk/test/Preprocessor/wasm-target-features.c (original) +++ cfe/trunk/test/Preprocessor/wasm-target-features.c Thu May 23 10:26:47 2019 @@ -80,6 +80,24 @@ // MUTABLE-GLOBALS:#define __wasm_mutable_globals__ 1{{$}} // RUN: %clang -E -dM %s -o - 2>&1 \ +// RUN: -target wasm32-unknown-unknown -mmultivalue \ +// RUN: | FileCheck %s -check-prefix=MULTIVALUE +// RUN: %clang -E -dM %s -o - 2>&1 \ +// RUN: -target wasm64-unknown-unknown -mmultivalue \ +// RUN: | FileCheck %s -check-prefix=MULTIVALUE +// +// MULTIVALUE:#define __wasm_multivalue__ 1{{$}} + +// RUN: %clang -E -dM %s -o - 2>&1 \ +// RUN: -target wasm32-unknown-unknown -mtail-call \ +// RUN: | FileCheck %s -check-prefix=TAIL-CALL +// RUN: %clang -E -dM %s -o - 2>&1 \ +// RUN: -target wasm64-unknown-unknown -mtail-call \ +// RUN: | FileCheck %s -check-prefix=TAIL-CALL +// +// TAIL-CALL:#define __wasm_tail_call__ 1{{$}} + +// RUN: %clang -E -dM %s -o - 2>&1 \ // RUN: -target wasm32-unknown-unknown -mcpu=mvp \ // RUN: | FileCheck %s -check-prefix=MVP // RUN: %clang -E -dM %s -o - 2>&1 \ @@ -94,6 +112,8 @@ // MVP-NOT:#define __wasm_bulk_memory__ // MVP-NOT:#define __wasm_atomics__ // MVP-NOT:#define __wasm_mutable_globals__ +// MVP-NOT:#define __wasm_multivalue__ +// MVP-NOT:#define __wasm_tail_call__ // RUN: %clang -E -dM %s -o - 2>&1 \ // RUN: -target wasm32-unknown-unknown -mcpu=bleeding-edge \ @@ -108,6 +128,8 @@ // BLEEDING-EDGE-DAG:#define __wasm_atomics__ 1{{$}} // BLEEDING-EDGE-DAG:#define __wasm_mutable_globals__ 1{{$}} // BLEEDING-EDGE-NOT:#define __wasm_unimplemented_simd128__ 1{{$}} +// BLEEDING-EDGE-NOT:#define __wasm_multivalue__ 1{{$}} +// BLEEDING-EDGE-NOT:#define __wasm_tail_call__ 1{{$}} // RUN: %clang -E -dM %s -o - 2>&1 \ // RUN: -target wasm32-unknown-unknown -mcpu=bleeding-edge -mno-simd128 \ _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
