Author: tlively Date: Fri Mar 29 15:00:18 2019 New Revision: 357321 URL: http://llvm.org/viewvc/llvm-project?rev=357321&view=rev Log: [WebAssembly] Add mutable globals feature
Summary: This feature is not actually used for anything in the WebAssembly backend, but adding it allows users to get it into the target features sections of their objects, which makes these objects future-compatible. Reviewers: aheejin, dschuff Subscribers: sbc100, jgravelle-google, hiraditya, sunfish, jdoerfert, cfe-commits, llvm-commits Tags: #clang, #llvm Differential Revision: https://reviews.llvm.org/D60013 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=357321&r1=357320&r2=357321&view=diff ============================================================================== --- cfe/trunk/include/clang/Driver/Options.td (original) +++ cfe/trunk/include/clang/Driver/Options.td Fri Mar 29 15:00:18 2019 @@ -2177,6 +2177,8 @@ def matomics : Flag<["-"], "matomics">, def mno_atomics : Flag<["-"], "mno-atomics">, Group<m_wasm_Features_Group>; def mbulk_memory : Flag<["-"], "mbulk-memory">, Group<m_wasm_Features_Group>; 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 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=357321&r1=357320&r2=357321&view=diff ============================================================================== --- cfe/trunk/lib/Basic/Targets/WebAssembly.cpp (original) +++ cfe/trunk/lib/Basic/Targets/WebAssembly.cpp Fri Mar 29 15:00:18 2019 @@ -42,6 +42,7 @@ bool WebAssemblyTargetInfo::hasFeature(S .Case("exception-handling", HasExceptionHandling) .Case("bulk-memory", HasBulkMemory) .Case("atomics", HasAtomics) + .Case("mutable-globals", HasMutableGlobals) .Default(false); } @@ -71,6 +72,8 @@ void WebAssemblyTargetInfo::getTargetDef Builder.defineMacro("__wasm_bulk_memory__"); if (HasAtomics) Builder.defineMacro("__wasm_atomics__"); + if (HasMutableGlobals) + Builder.defineMacro("__wasm_mutable_globals__"); } void WebAssemblyTargetInfo::setSIMDLevel(llvm::StringMap<bool> &Features, @@ -94,6 +97,7 @@ bool WebAssemblyTargetInfo::initFeatureM Features["nontrapping-fptoint"] = true; Features["sign-ext"] = true; Features["atomics"] = true; + Features["mutable-globals"] = true; setSIMDLevel(Features, SIMD128); } // Other targets do not consider user-configured features here, but while we @@ -110,6 +114,8 @@ bool WebAssemblyTargetInfo::initFeatureM Features["bulk-memory"] = true; if (HasAtomics) Features["atomics"] = true; + if (HasMutableGlobals) + Features["mutable-globals"] = true; return TargetInfo::initFeatureMap(Features, Diags, CPU, FeaturesVec); } @@ -173,6 +179,14 @@ bool WebAssemblyTargetInfo::handleTarget HasAtomics = false; continue; } + if (Feature == "+mutable-globals") { + HasMutableGlobals = true; + continue; + } + if (Feature == "-mutable-globals") { + HasMutableGlobals = 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=357321&r1=357320&r2=357321&view=diff ============================================================================== --- cfe/trunk/lib/Basic/Targets/WebAssembly.h (original) +++ cfe/trunk/lib/Basic/Targets/WebAssembly.h Fri Mar 29 15:00:18 2019 @@ -35,6 +35,7 @@ class LLVM_LIBRARY_VISIBILITY WebAssembl bool HasExceptionHandling = false; bool HasBulkMemory = false; bool HasAtomics = false; + bool HasMutableGlobals = 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=357321&r1=357320&r2=357321&view=diff ============================================================================== --- cfe/trunk/test/Preprocessor/wasm-target-features.c (original) +++ cfe/trunk/test/Preprocessor/wasm-target-features.c Fri Mar 29 15:00:18 2019 @@ -71,6 +71,15 @@ // PTHREAD:#define __wasm_atomics__ 1{{$}} // RUN: %clang -E -dM %s -o - 2>&1 \ +// RUN: -target wasm32-unknown-unknown -mmutable-globals \ +// RUN: | FileCheck %s -check-prefix=MUTABLE-GLOBALS +// RUN: %clang -E -dM %s -o - 2>&1 \ +// RUN: -target wasm64-unknown-unknown -mmutable-globals \ +// RUN: | FileCheck %s -check-prefix=MUTABLE-GLOBALS +// +// MUTABLE-GLOBALS:#define __wasm_mutable_globals__ 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 \ @@ -84,6 +93,7 @@ // MVP-NOT:#define __wasm_exception_handling__ // MVP-NOT:#define __wasm_bulk_memory__ // MVP-NOT:#define __wasm_atomics__ +// MVP-NOT:#define __wasm_mutable_globals__ // RUN: %clang -E -dM %s -o - 2>&1 \ // RUN: -target wasm32-unknown-unknown -mcpu=bleeding-edge \ @@ -96,6 +106,7 @@ // BLEEDING-EDGE-DAG:#define __wasm_sign_ext__ 1{{$}} // BLEEDING-EDGE-DAG:#define __wasm_simd128__ 1{{$}} // BLEEDING-EDGE-DAG:#define __wasm_atomics__ 1{{$}} +// BLEEDING-EDGE-DAG:#define __wasm_mutable_globals__ 1{{$}} // BLEEDING-EDGE-NOT:#define __wasm_unimplemented_simd128__ 1{{$}} // RUN: %clang -E -dM %s -o - 2>&1 \ _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
