Author: Kai Nacke
Date: 2026-04-08T09:05:13-04:00
New Revision: 1f1ea1ae4151746a03d43cb7b55411d3bd7878bf

URL: 
https://github.com/llvm/llvm-project/commit/1f1ea1ae4151746a03d43cb7b55411d3bd7878bf
DIFF: 
https://github.com/llvm/llvm-project/commit/1f1ea1ae4151746a03d43cb7b55411d3bd7878bf.diff

LOG: [SystemZ] Migrate BuiltinsSystemZ.def to TableGen (#190232)

Migrates BuiltinsSystemZ.def to BuiltinsSystemZ.td, and makes the
necessary code updates. It also introduce type `__uint128_t` to the
TableGen emitter, to have a type for the encoding `ULLLi`.

Migration was done with the help of a script generated by IBM Bob.

Added: 
    clang/include/clang/Basic/BuiltinsSystemZ.td

Modified: 
    clang/include/clang/Basic/CMakeLists.txt
    clang/include/clang/Basic/TargetBuiltins.h
    clang/include/module.modulemap
    clang/lib/Basic/Targets/SystemZ.cpp
    clang/utils/TableGen/ClangBuiltinsEmitter.cpp

Removed: 
    clang/include/clang/Basic/BuiltinsSystemZ.def


################################################################################
diff  --git a/clang/include/clang/Basic/BuiltinsSystemZ.def 
b/clang/include/clang/Basic/BuiltinsSystemZ.def
deleted file mode 100644
index ba94c1a130f95..0000000000000
--- a/clang/include/clang/Basic/BuiltinsSystemZ.def
+++ /dev/null
@@ -1,338 +0,0 @@
-//===-- BuiltinsSystemZ.def - SystemZ Builtin function database -*- C++ 
-*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM 
Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file defines the SystemZ-specific builtin function database.  Users of
-// this file must define the BUILTIN macro to make use of this information.
-//
-//===----------------------------------------------------------------------===//
-
-// The format of this database matches clang/Basic/Builtins.def.
-
-#if defined(BUILTIN) && !defined(TARGET_BUILTIN)
-#   define TARGET_BUILTIN(ID, TYPE, ATTRS, FEATURE) BUILTIN(ID, TYPE, ATTRS)
-#endif
-
-// Transactional-memory intrinsics
-TARGET_BUILTIN(__builtin_tbegin, "iv*", "j", "transactional-execution")
-TARGET_BUILTIN(__builtin_tbegin_nofloat, "iv*", "j", "transactional-execution")
-TARGET_BUILTIN(__builtin_tbeginc, "v", "nj", "transactional-execution")
-TARGET_BUILTIN(__builtin_tabort, "vi", "r", "transactional-execution")
-TARGET_BUILTIN(__builtin_tend, "i", "n", "transactional-execution")
-TARGET_BUILTIN(__builtin_tx_nesting_depth, "i", "nc", 
"transactional-execution")
-TARGET_BUILTIN(__builtin_tx_assist, "vi", "n", "transactional-execution")
-TARGET_BUILTIN(__builtin_non_tx_store, "vULi*ULi", "", 
"transactional-execution")
-
-// Vector intrinsics.
-// These all map directly to z instructions, except that some variants ending
-// in "s" have a final "int *" that receives the post-instruction CC value.
-
-// Vector support instructions (chapter 21 of the PoP)
-TARGET_BUILTIN(__builtin_s390_lcbb, "UivC*Ii", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vlbb, "V16ScvC*Ii", "", "vector")
-TARGET_BUILTIN(__builtin_s390_vll, "V16ScUivC*", "", "vector")
-TARGET_BUILTIN(__builtin_s390_vstl, "vV16ScUiv*", "", "vector")
-TARGET_BUILTIN(__builtin_s390_vperm, "V16UcV16UcV16UcV16Uc", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vpdi, "V2ULLiV2ULLiV2ULLiIi", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vpksh, "V16ScV8SsV8Ss", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vpkshs, "V16ScV8SsV8Ssi*", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vpksf, "V8SsV4SiV4Si", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vpksfs, "V8SsV4SiV4Sii*", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vpksg, "V4SiV2SLLiV2SLLi", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vpksgs, "V4SiV2SLLiV2SLLii*", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vpklsh, "V16UcV8UsV8Us", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vpklshs, "V16UcV8UsV8Usi*", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vpklsf, "V8UsV4UiV4Ui", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vpklsfs, "V8UsV4UiV4Uii*", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vpklsg, "V4UiV2ULLiV2ULLi", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vpklsgs, "V4UiV2ULLiV2ULLii*", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vuphb, "V8SsV16Sc", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vuphh, "V4SiV8Ss", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vuphf, "V2SLLiV4Si", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vuplb, "V8SsV16Sc", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vuplhw, "V4SiV8Ss", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vuplf, "V2SLLiV4Si", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vuplhb, "V8UsV16Uc", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vuplhh, "V4UiV8Us", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vuplhf, "V2ULLiV4Ui", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vupllb, "V8UsV16Uc", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vupllh, "V4UiV8Us", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vupllf, "V2ULLiV4Ui", "nc", "vector")
-
-// Vector integer instructions (chapter 22 of the PoP)
-TARGET_BUILTIN(__builtin_s390_vaq, "SLLLiSLLLiSLLLi", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vacq, "ULLLiULLLiULLLiULLLi", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vaccb, "V16UcV16UcV16Uc", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vacch, "V8UsV8UsV8Us", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vaccf, "V4UiV4UiV4Ui", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vaccg, "V2ULLiV2ULLiV2ULLi", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vaccq, "ULLLiULLLiULLLi", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vacccq, "ULLLiULLLiULLLiULLLi", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vavgb, "V16ScV16ScV16Sc", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vavgh, "V8SsV8SsV8Ss", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vavgf, "V4SiV4SiV4Si", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vavgg, "V2SLLiV2SLLiV2SLLi", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vavglb, "V16UcV16UcV16Uc", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vavglh, "V8UsV8UsV8Us", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vavglf, "V4UiV4UiV4Ui", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vavglg, "V2ULLiV2ULLiV2ULLi", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vceqbs, "V16ScV16UcV16Uci*", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vceqhs, "V8SsV8UsV8Usi*", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vceqfs, "V4SiV4UiV4Uii*", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vceqgs, "V2SLLiV2ULLiV2ULLii*", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vchbs, "V16ScV16ScV16Sci*", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vchhs, "V8SsV8SsV8Ssi*", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vchfs, "V4SiV4SiV4Sii*", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vchgs, "V2SLLiV2SLLiV2SLLii*", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vchlbs, "V16ScV16UcV16Uci*", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vchlhs, "V8SsV8UsV8Usi*", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vchlfs, "V4SiV4UiV4Uii*", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vchlgs, "V2SLLiV2ULLiV2ULLii*", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vcksm, "V4UiV4UiV4Ui", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vclzb, "V16UcV16Uc", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vclzh, "V8UsV8Us", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vclzf, "V4UiV4Ui", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vclzg, "V2ULLiV2ULLi", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vctzb, "V16UcV16Uc", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vctzh, "V8UsV8Us", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vctzf, "V4UiV4Ui", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vctzg, "V2ULLiV2ULLi", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_verimb, "V16UcV16UcV16UcV16UcIi", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_verimh, "V8UsV8UsV8UsV8UsIi", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_verimf, "V4UiV4UiV4UiV4UiIi", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_verimg, "V2ULLiV2ULLiV2ULLiV2ULLiIi", "nc", 
"vector")
-TARGET_BUILTIN(__builtin_s390_verllb, "V16UcV16UcUc", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_verllh, "V8UsV8UsUc", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_verllf, "V4UiV4UiUc", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_verllg, "V2ULLiV2ULLiUc", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_verllvb, "V16UcV16UcV16Uc", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_verllvh, "V8UsV8UsV8Us", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_verllvf, "V4UiV4UiV4Ui", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_verllvg, "V2ULLiV2ULLiV2ULLi", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vgfmb, "V8UsV16UcV16Uc", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vgfmh, "V4UiV8UsV8Us", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vgfmf, "V2ULLiV4UiV4Ui", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vgfmg, "ULLLiV2ULLiV2ULLi", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vgfmab, "V8UsV16UcV16UcV8Us", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vgfmah, "V4UiV8UsV8UsV4Ui", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vgfmaf, "V2ULLiV4UiV4UiV2ULLi", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vgfmag, "ULLLiV2ULLiV2ULLiULLLi", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vmahb, "V16ScV16ScV16ScV16Sc", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vmahh, "V8SsV8SsV8SsV8Ss", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vmahf, "V4SiV4SiV4SiV4Si", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vmalhb, "V16UcV16UcV16UcV16Uc", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vmalhh, "V8UsV8UsV8UsV8Us", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vmalhf, "V4UiV4UiV4UiV4Ui", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vmaeb, "V8SsV16ScV16ScV8Ss", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vmaeh, "V4SiV8SsV8SsV4Si", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vmaef, "V2SLLiV4SiV4SiV2SLLi", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vmaleb, "V8UsV16UcV16UcV8Us", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vmaleh, "V4UiV8UsV8UsV4Ui", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vmalef, "V2ULLiV4UiV4UiV2ULLi", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vmaob, "V8SsV16ScV16ScV8Ss", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vmaoh, "V4SiV8SsV8SsV4Si", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vmaof, "V2SLLiV4SiV4SiV2SLLi", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vmalob, "V8UsV16UcV16UcV8Us", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vmaloh, "V4UiV8UsV8UsV4Ui", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vmalof, "V2ULLiV4UiV4UiV2ULLi", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vmhb, "V16ScV16ScV16Sc", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vmhh, "V8SsV8SsV8Ss", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vmhf, "V4SiV4SiV4Si", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vmlhb, "V16UcV16UcV16Uc", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vmlhh, "V8UsV8UsV8Us", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vmlhf, "V4UiV4UiV4Ui", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vmeb, "V8SsV16ScV16Sc", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vmeh, "V4SiV8SsV8Ss", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vmef, "V2SLLiV4SiV4Si", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vmleb, "V8UsV16UcV16Uc", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vmleh, "V4UiV8UsV8Us", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vmlef, "V2ULLiV4UiV4Ui", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vmob, "V8SsV16ScV16Sc", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vmoh, "V4SiV8SsV8Ss", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vmof, "V2SLLiV4SiV4Si", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vmlob, "V8UsV16UcV16Uc", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vmloh, "V4UiV8UsV8Us", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vmlof, "V2ULLiV4UiV4Ui", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vsq, "SLLLiSLLLiSLLLi", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vsbcbiq, "ULLLiULLLiULLLiULLLi", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vsbiq, "ULLLiULLLiULLLiULLLi", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vscbib, "V16UcV16UcV16Uc", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vscbih, "V8UsV8UsV8Us", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vscbif, "V4UiV4UiV4Ui", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vscbig, "V2ULLiV2ULLiV2ULLi", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vscbiq, "ULLLiULLLiULLLi", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vsl, "V16UcV16UcV16Uc", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vslb, "V16UcV16UcV16Uc", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vsldb, "V16UcV16UcV16UcIi", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vsra, "V16UcV16UcV16Uc", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vsrab, "V16UcV16UcV16Uc", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vsrl, "V16UcV16UcV16Uc", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vsrlb, "V16UcV16UcV16Uc", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vsumb, "V4UiV16UcV16Uc", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vsumh, "V4UiV8UsV8Us", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vsumgh, "V2ULLiV8UsV8Us", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vsumgf, "V2ULLiV4UiV4Ui", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vsumqf, "ULLLiV4UiV4Ui", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vsumqg, "ULLLiV2ULLiV2ULLi", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vtm, "iV16UcV16Uc", "nc", "vector")
-
-// Vector string instructions (chapter 23 of the PoP)
-TARGET_BUILTIN(__builtin_s390_vfaeb, "V16UcV16UcV16UcIi", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vfaebs, "V16UcV16UcV16UcIii*", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vfaeh, "V8UsV8UsV8UsIi", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vfaehs, "V8UsV8UsV8UsIii*", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vfaef, "V4UiV4UiV4UiIi", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vfaefs, "V4UiV4UiV4UiIii*", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vfaezb, "V16UcV16UcV16UcIi", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vfaezbs, "V16UcV16UcV16UcIii*", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vfaezh, "V8UsV8UsV8UsIi", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vfaezhs, "V8UsV8UsV8UsIii*", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vfaezf, "V4UiV4UiV4UiIi", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vfaezfs, "V4UiV4UiV4UiIii*", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vfeeb, "V16UcV16UcV16Uc", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vfeebs, "V16UcV16UcV16Uci*", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vfeeh, "V8UsV8UsV8Us", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vfeehs, "V8UsV8UsV8Usi*", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vfeef, "V4UiV4UiV4Ui", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vfeefs, "V4UiV4UiV4Uii*", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vfeezb, "V16UcV16UcV16Uc", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vfeezbs, "V16UcV16UcV16Uci*", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vfeezh, "V8UsV8UsV8Us", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vfeezhs, "V8UsV8UsV8Usi*", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vfeezf, "V4UiV4UiV4Ui", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vfeezfs, "V4UiV4UiV4Uii*", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vfeneb, "V16UcV16UcV16Uc", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vfenebs, "V16UcV16UcV16Uci*", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vfeneh, "V8UsV8UsV8Us", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vfenehs, "V8UsV8UsV8Usi*", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vfenef, "V4UiV4UiV4Ui", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vfenefs, "V4UiV4UiV4Uii*", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vfenezb, "V16UcV16UcV16Uc", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vfenezbs, "V16UcV16UcV16Uci*", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vfenezh, "V8UsV8UsV8Us", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vfenezhs, "V8UsV8UsV8Usi*", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vfenezf, "V4UiV4UiV4Ui", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vfenezfs, "V4UiV4UiV4Uii*", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vistrb, "V16UcV16Uc", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vistrbs, "V16UcV16Uci*", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vistrh, "V8UsV8Us", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vistrhs, "V8UsV8Usi*", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vistrf, "V4UiV4Ui", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vistrfs, "V4UiV4Uii*", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vstrcb, "V16UcV16UcV16UcV16UcIi", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vstrcbs, "V16UcV16UcV16UcV16UcIii*", "nc", 
"vector")
-TARGET_BUILTIN(__builtin_s390_vstrch, "V8UsV8UsV8UsV8UsIi", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vstrchs, "V8UsV8UsV8UsV8UsIii*", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vstrcf, "V4UiV4UiV4UiV4UiIi", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vstrcfs, "V4UiV4UiV4UiV4UiIii*", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vstrczb, "V16UcV16UcV16UcV16UcIi", "nc", 
"vector")
-TARGET_BUILTIN(__builtin_s390_vstrczbs, "V16UcV16UcV16UcV16UcIii*", "nc", 
"vector")
-TARGET_BUILTIN(__builtin_s390_vstrczh, "V8UsV8UsV8UsV8UsIi", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vstrczhs, "V8UsV8UsV8UsV8UsIii*", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vstrczf, "V4UiV4UiV4UiV4UiIi", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vstrczfs, "V4UiV4UiV4UiV4UiIii*", "nc", "vector")
-
-// Vector floating-point instructions (chapter 24 of the PoP)
-TARGET_BUILTIN(__builtin_s390_vfcedbs, "V2SLLiV2dV2di*", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vfchdbs, "V2SLLiV2dV2di*", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vfchedbs, "V2SLLiV2dV2di*", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vfidb, "V2dV2dIiIi", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vflndb, "V2dV2d", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vflpdb, "V2dV2d", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vfmadb, "V2dV2dV2dV2d", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vfmsdb, "V2dV2dV2dV2d", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vfsqdb, "V2dV2d", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vftcidb, "V2SLLiV2dIii*", "nc", "vector")
-
-// Vector-enhancements facility 1 intrinsics.
-TARGET_BUILTIN(__builtin_s390_vlrlr, "V16ScUivC*", "", "vector-enhancements-1")
-TARGET_BUILTIN(__builtin_s390_vstrlr, "vV16ScUiv*", "", 
"vector-enhancements-1")
-TARGET_BUILTIN(__builtin_s390_vbperm, "V2ULLiV16UcV16Uc", "nc", 
"vector-enhancements-1")
-TARGET_BUILTIN(__builtin_s390_vmslg, "ULLLiV2ULLiV2ULLiULLLiIi", "nc", 
"vector-enhancements-1")
-TARGET_BUILTIN(__builtin_s390_vfmaxdb, "V2dV2dV2dIi", "nc", 
"vector-enhancements-1")
-TARGET_BUILTIN(__builtin_s390_vfmindb, "V2dV2dV2dIi", "nc", 
"vector-enhancements-1")
-TARGET_BUILTIN(__builtin_s390_vfnmadb, "V2dV2dV2dV2d", "nc", 
"vector-enhancements-1")
-TARGET_BUILTIN(__builtin_s390_vfnmsdb, "V2dV2dV2dV2d", "nc", 
"vector-enhancements-1")
-TARGET_BUILTIN(__builtin_s390_vfcesbs, "V4SiV4fV4fi*", "nc", 
"vector-enhancements-1")
-TARGET_BUILTIN(__builtin_s390_vfchsbs, "V4SiV4fV4fi*", "nc", 
"vector-enhancements-1")
-TARGET_BUILTIN(__builtin_s390_vfchesbs, "V4SiV4fV4fi*", "nc", 
"vector-enhancements-1")
-TARGET_BUILTIN(__builtin_s390_vfisb, "V4fV4fIiIi", "nc", 
"vector-enhancements-1")
-TARGET_BUILTIN(__builtin_s390_vfmaxsb, "V4fV4fV4fIi", "nc", 
"vector-enhancements-1")
-TARGET_BUILTIN(__builtin_s390_vfminsb, "V4fV4fV4fIi", "nc", 
"vector-enhancements-1")
-TARGET_BUILTIN(__builtin_s390_vflnsb, "V4fV4f", "nc", "vector-enhancements-1")
-TARGET_BUILTIN(__builtin_s390_vflpsb, "V4fV4f", "nc", "vector-enhancements-1")
-TARGET_BUILTIN(__builtin_s390_vfmasb, "V4fV4fV4fV4f", "nc", 
"vector-enhancements-1")
-TARGET_BUILTIN(__builtin_s390_vfmssb, "V4fV4fV4fV4f", "nc", 
"vector-enhancements-1")
-TARGET_BUILTIN(__builtin_s390_vfnmasb, "V4fV4fV4fV4f", "nc", 
"vector-enhancements-1")
-TARGET_BUILTIN(__builtin_s390_vfnmssb, "V4fV4fV4fV4f", "nc", 
"vector-enhancements-1")
-TARGET_BUILTIN(__builtin_s390_vfsqsb, "V4fV4f", "nc", "vector-enhancements-1")
-TARGET_BUILTIN(__builtin_s390_vftcisb, "V4SiV4fIii*", "nc", 
"vector-enhancements-1")
-
-// Vector-enhancements facility 2 intrinsics.
-TARGET_BUILTIN(__builtin_s390_vsld, "V16UcV16UcV16UcIi", "nc", 
"vector-enhancements-2")
-TARGET_BUILTIN(__builtin_s390_vsrd, "V16UcV16UcV16UcIi", "nc", 
"vector-enhancements-2")
-TARGET_BUILTIN(__builtin_s390_vstrsb, "V16UcV16UcV16UcV16Uci*", "nc", 
"vector-enhancements-2")
-TARGET_BUILTIN(__builtin_s390_vstrsh, "V16UcV8UsV8UsV16Uci*", "nc", 
"vector-enhancements-2")
-TARGET_BUILTIN(__builtin_s390_vstrsf, "V16UcV4UiV4UiV16Uci*", "nc", 
"vector-enhancements-2")
-TARGET_BUILTIN(__builtin_s390_vstrszb, "V16UcV16UcV16UcV16Uci*", "nc", 
"vector-enhancements-2")
-TARGET_BUILTIN(__builtin_s390_vstrszh, "V16UcV8UsV8UsV16Uci*", "nc", 
"vector-enhancements-2")
-TARGET_BUILTIN(__builtin_s390_vstrszf, "V16UcV4UiV4UiV16Uci*", "nc", 
"vector-enhancements-2")
-
-// Helpers to implement vec_revb.
-TARGET_BUILTIN(__builtin_s390_vlbrh, "V8UsV8Us", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vlbrf, "V4UiV4Ui", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vlbrg, "V2ULLiV2ULLi", "nc", "vector")
-TARGET_BUILTIN(__builtin_s390_vlbrq, "ULLLiULLLi", "nc", "vector")
-
-// NNP-assist facility intrinsics.
-TARGET_BUILTIN(__builtin_s390_vclfnhs, "V4fV8UsIi", "nc", "nnp-assist")
-TARGET_BUILTIN(__builtin_s390_vclfnls, "V4fV8UsIi", "nc", "nnp-assist")
-TARGET_BUILTIN(__builtin_s390_vcrnfs, "V8UsV4fV4fIi", "nc", "nnp-assist")
-TARGET_BUILTIN(__builtin_s390_vcfn, "V8UsV8UsIi", "nc", "nnp-assist")
-TARGET_BUILTIN(__builtin_s390_vcnf, "V8UsV8UsIi", "nc", "nnp-assist")
-
-// Miscellaneous instruction extensions facility 4 intrinsics.
-TARGET_BUILTIN(__builtin_s390_bdepg, "ULiULiULi", "nc", 
"miscellaneous-extensions-4")
-TARGET_BUILTIN(__builtin_s390_bextg, "ULiULiULi", "nc", 
"miscellaneous-extensions-4")
-
-// Vector-enhancements facility 3 intrinsics.
-TARGET_BUILTIN(__builtin_s390_vgemb, "V16UcV8Us", "nc", 
"vector-enhancements-3")
-TARGET_BUILTIN(__builtin_s390_vgemh, "V8UsV16Uc", "nc", 
"vector-enhancements-3")
-TARGET_BUILTIN(__builtin_s390_vgemf, "V4UiV16Uc", "nc", 
"vector-enhancements-3")
-TARGET_BUILTIN(__builtin_s390_vgemg, "V2ULLiV16Uc", "nc", 
"vector-enhancements-3")
-TARGET_BUILTIN(__builtin_s390_vgemq, "ULLLiV16Uc", "nc", 
"vector-enhancements-3")
-TARGET_BUILTIN(__builtin_s390_vuplg, "SLLLiV2SLLi", "nc", 
"vector-enhancements-3")
-TARGET_BUILTIN(__builtin_s390_vupllg, "ULLLiV2ULLi", "nc", 
"vector-enhancements-3")
-TARGET_BUILTIN(__builtin_s390_vuphg, "SLLLiV2SLLi", "nc", 
"vector-enhancements-3")
-TARGET_BUILTIN(__builtin_s390_vuplhg, "ULLLiV2ULLi", "nc", 
"vector-enhancements-3")
-TARGET_BUILTIN(__builtin_s390_vavgq, "SLLLiSLLLiSLLLi", "nc", 
"vector-enhancements-3")
-TARGET_BUILTIN(__builtin_s390_vavglq, "ULLLiULLLiULLLi", "nc", 
"vector-enhancements-3")
-TARGET_BUILTIN(__builtin_s390_veval, "V16UcV16UcV16UcV16UcIi", "nc", 
"vector-enhancements-3")
-TARGET_BUILTIN(__builtin_s390_vmahg, "V2SLLiV2SLLiV2SLLiV2SLLi", "nc", 
"vector-enhancements-3")
-TARGET_BUILTIN(__builtin_s390_vmahq, "SLLLiSLLLiSLLLiSLLLi", "nc", 
"vector-enhancements-3")
-TARGET_BUILTIN(__builtin_s390_vmalhg, "V2ULLiV2ULLiV2ULLiV2ULLi", "nc", 
"vector-enhancements-3")
-TARGET_BUILTIN(__builtin_s390_vmalhq, "ULLLiULLLiULLLiULLLi", "nc", 
"vector-enhancements-3")
-TARGET_BUILTIN(__builtin_s390_vmaeg, "SLLLiV2SLLiV2SLLiSLLLi", "nc", 
"vector-enhancements-3")
-TARGET_BUILTIN(__builtin_s390_vmaleg, "ULLLiV2ULLiV2ULLiULLLi", "nc", 
"vector-enhancements-3")
-TARGET_BUILTIN(__builtin_s390_vmaog, "SLLLiV2SLLiV2SLLiSLLLi", "nc", 
"vector-enhancements-3")
-TARGET_BUILTIN(__builtin_s390_vmalog, "ULLLiV2ULLiV2ULLiULLLi", "nc", 
"vector-enhancements-3")
-TARGET_BUILTIN(__builtin_s390_vmhg, "V2SLLiV2SLLiV2SLLi", "nc", 
"vector-enhancements-3")
-TARGET_BUILTIN(__builtin_s390_vmhq, "SLLLiSLLLiSLLLi", "nc", 
"vector-enhancements-3")
-TARGET_BUILTIN(__builtin_s390_vmlhg, "V2ULLiV2ULLiV2ULLi", "nc", 
"vector-enhancements-3")
-TARGET_BUILTIN(__builtin_s390_vmlhq, "ULLLiULLLiULLLi", "nc", 
"vector-enhancements-3")
-TARGET_BUILTIN(__builtin_s390_vmeg, "SLLLiV2SLLiV2SLLi", "nc", 
"vector-enhancements-3")
-TARGET_BUILTIN(__builtin_s390_vmleg, "ULLLiV2ULLiV2ULLi", "nc", 
"vector-enhancements-3")
-TARGET_BUILTIN(__builtin_s390_vmog, "SLLLiV2SLLiV2SLLi", "nc", 
"vector-enhancements-3")
-TARGET_BUILTIN(__builtin_s390_vmlog, "ULLLiV2ULLiV2ULLi", "nc", 
"vector-enhancements-3")
-TARGET_BUILTIN(__builtin_s390_vceqqs, "SLLLiULLLiULLLii*", "nc", 
"vector-enhancements-3")
-TARGET_BUILTIN(__builtin_s390_vchqs, "SLLLiSLLLiSLLLii*", "nc", 
"vector-enhancements-3")
-TARGET_BUILTIN(__builtin_s390_vchlqs, "SLLLiULLLiULLLii*", "nc", 
"vector-enhancements-3")
-TARGET_BUILTIN(__builtin_s390_vclzq, "ULLLiULLLi", "nc", 
"vector-enhancements-3")
-TARGET_BUILTIN(__builtin_s390_vctzq, "ULLLiULLLi", "nc", 
"vector-enhancements-3")
-
-#undef BUILTIN
-#undef TARGET_BUILTIN

diff  --git a/clang/include/clang/Basic/BuiltinsSystemZ.td 
b/clang/include/clang/Basic/BuiltinsSystemZ.td
new file mode 100644
index 0000000000000..946a03cd66170
--- /dev/null
+++ b/clang/include/clang/Basic/BuiltinsSystemZ.td
@@ -0,0 +1,377 @@
+//===-- BuiltinsSystemZ.td - SystemZ Builtin function database --*- C++ 
-*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM 
Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+//
+// This file defines the SystemZ-specific builtin function database.
+//
+//===----------------------------------------------------------------------===//
+
+include "clang/Basic/BuiltinsBase.td"
+
+def SystemZPrefix : NamePrefix<"__builtin_s390_">;
+
+class SystemZTargetBuiltin<string prototype> : TargetBuiltin {
+  let Spellings = [NAME];
+  let Prototype = prototype;
+  let RequiredNamePrefix = SystemZPrefix;
+}
+
+class SystemZNoPrefixTargetBuiltin<string prototype> : TargetBuiltin {
+  let Spellings = [NAME];
+  let Prototype = prototype;
+}
+
+// Transactional-memory intrinsics
+let Features = "transactional-execution" in {
+  let Attributes = [ReturnsTwice] in {
+    def __builtin_tbegin : SystemZNoPrefixTargetBuiltin<"int(void *)">;
+    def __builtin_tbegin_nofloat : SystemZNoPrefixTargetBuiltin<"int(void *)">;
+  }
+  let Attributes = [NoThrow, ReturnsTwice] in
+    def __builtin_tbeginc : SystemZNoPrefixTargetBuiltin<"void()">;
+  let Attributes = [NoReturn] in
+    def __builtin_tabort : SystemZNoPrefixTargetBuiltin<"void(int)">;
+  let Attributes = [NoThrow] in
+    def __builtin_tend : SystemZNoPrefixTargetBuiltin<"int()">;
+  let Attributes = [NoThrow, Const] in
+    def __builtin_tx_nesting_depth : SystemZNoPrefixTargetBuiltin<"int()">;
+  let Attributes = [NoThrow] in
+    def __builtin_tx_assist : SystemZNoPrefixTargetBuiltin<"void(int)">;
+  def __builtin_non_tx_store : SystemZNoPrefixTargetBuiltin<"void(unsigned 
long int *, unsigned long int)">;
+}
+
+// Vector intrinsics.
+// These all map directly to z instructions, except that some variants ending
+// in "s" have a final "int *" that receives the post-instruction CC value.
+
+// Vector support instructions (chapter 21 of the PoP)
+let Attributes = [NoThrow, Const], Features = "vector" in
+  def lcbb : SystemZTargetBuiltin<"unsigned int(void const *, int)">;
+let Features = "vector" in {
+  def vlbb : SystemZTargetBuiltin<"_Vector<16, signed char>(void const *, 
int)">;
+  def vll : SystemZTargetBuiltin<"_Vector<16, signed char>(unsigned int, void 
const *)">;
+  def vstl : SystemZTargetBuiltin<"void(_Vector<16, signed char>, unsigned 
int, void *)">;
+}
+let Attributes = [NoThrow, Const], Features = "vector" in {
+  def vperm : SystemZTargetBuiltin<"_Vector<16, unsigned char>(_Vector<16, 
unsigned char>, _Vector<16, unsigned char>, _Vector<16, unsigned char>)">;
+  def vpdi : SystemZTargetBuiltin<"_Vector<2, unsigned long long 
int>(_Vector<2, unsigned long long int>, _Vector<2, unsigned long long int>, 
int)">;
+  def vpksh : SystemZTargetBuiltin<"_Vector<16, signed char>(_Vector<8, signed 
short>, _Vector<8, signed short>)">;
+  def vpkshs : SystemZTargetBuiltin<"_Vector<16, signed char>(_Vector<8, 
signed short>, _Vector<8, signed short>, int *)">;
+  def vpksf : SystemZTargetBuiltin<"_Vector<8, signed short>(_Vector<4, signed 
int>, _Vector<4, signed int>)">;
+  def vpksfs : SystemZTargetBuiltin<"_Vector<8, signed short>(_Vector<4, 
signed int>, _Vector<4, signed int>, int *)">;
+  def vpksg : SystemZTargetBuiltin<"_Vector<4, signed int>(_Vector<2, signed 
long long int>, _Vector<2, signed long long int>)">;
+  def vpksgs : SystemZTargetBuiltin<"_Vector<4, signed int>(_Vector<2, signed 
long long int>, _Vector<2, signed long long int>, int *)">;
+  def vpklsh : SystemZTargetBuiltin<"_Vector<16, unsigned char>(_Vector<8, 
unsigned short>, _Vector<8, unsigned short>)">;
+  def vpklshs : SystemZTargetBuiltin<"_Vector<16, unsigned char>(_Vector<8, 
unsigned short>, _Vector<8, unsigned short>, int *)">;
+  def vpklsf : SystemZTargetBuiltin<"_Vector<8, unsigned short>(_Vector<4, 
unsigned int>, _Vector<4, unsigned int>)">;
+  def vpklsfs : SystemZTargetBuiltin<"_Vector<8, unsigned short>(_Vector<4, 
unsigned int>, _Vector<4, unsigned int>, int *)">;
+  def vpklsg : SystemZTargetBuiltin<"_Vector<4, unsigned int>(_Vector<2, 
unsigned long long int>, _Vector<2, unsigned long long int>)">;
+  def vpklsgs : SystemZTargetBuiltin<"_Vector<4, unsigned int>(_Vector<2, 
unsigned long long int>, _Vector<2, unsigned long long int>, int *)">;
+  def vuphb : SystemZTargetBuiltin<"_Vector<8, signed short>(_Vector<16, 
signed char>)">;
+  def vuphh : SystemZTargetBuiltin<"_Vector<4, signed int>(_Vector<8, signed 
short>)">;
+  def vuphf : SystemZTargetBuiltin<"_Vector<2, signed long long 
int>(_Vector<4, signed int>)">;
+  def vuplb : SystemZTargetBuiltin<"_Vector<8, signed short>(_Vector<16, 
signed char>)">;
+  def vuplhw : SystemZTargetBuiltin<"_Vector<4, signed int>(_Vector<8, signed 
short>)">;
+  def vuplf : SystemZTargetBuiltin<"_Vector<2, signed long long 
int>(_Vector<4, signed int>)">;
+  def vuplhb : SystemZTargetBuiltin<"_Vector<8, unsigned short>(_Vector<16, 
unsigned char>)">;
+  def vuplhh : SystemZTargetBuiltin<"_Vector<4, unsigned int>(_Vector<8, 
unsigned short>)">;
+  def vuplhf : SystemZTargetBuiltin<"_Vector<2, unsigned long long 
int>(_Vector<4, unsigned int>)">;
+  def vupllb : SystemZTargetBuiltin<"_Vector<8, unsigned short>(_Vector<16, 
unsigned char>)">;
+  def vupllh : SystemZTargetBuiltin<"_Vector<4, unsigned int>(_Vector<8, 
unsigned short>)">;
+  def vupllf : SystemZTargetBuiltin<"_Vector<2, unsigned long long 
int>(_Vector<4, unsigned int>)">;
+}
+
+// Vector integer instructions (chapter 22 of the PoP)
+let Attributes = [NoThrow, Const], Features = "vector" in {
+  def vaq : SystemZTargetBuiltin<"__int128_t(__int128_t, __int128_t)">;
+  def vacq : SystemZTargetBuiltin<"__uint128_t(__uint128_t, __uint128_t, 
__uint128_t)">;
+  def vaccb : SystemZTargetBuiltin<"_Vector<16, unsigned char>(_Vector<16, 
unsigned char>, _Vector<16, unsigned char>)">;
+  def vacch : SystemZTargetBuiltin<"_Vector<8, unsigned short>(_Vector<8, 
unsigned short>, _Vector<8, unsigned short>)">;
+  def vaccf : SystemZTargetBuiltin<"_Vector<4, unsigned int>(_Vector<4, 
unsigned int>, _Vector<4, unsigned int>)">;
+  def vaccg : SystemZTargetBuiltin<"_Vector<2, unsigned long long 
int>(_Vector<2, unsigned long long int>, _Vector<2, unsigned long long int>)">;
+  def vaccq : SystemZTargetBuiltin<"__uint128_t(__uint128_t, __uint128_t)">;
+  def vacccq : SystemZTargetBuiltin<"__uint128_t(__uint128_t, __uint128_t, 
__uint128_t)">;
+  def vavgb : SystemZTargetBuiltin<"_Vector<16, signed char>(_Vector<16, 
signed char>, _Vector<16, signed char>)">;
+  def vavgh : SystemZTargetBuiltin<"_Vector<8, signed short>(_Vector<8, signed 
short>, _Vector<8, signed short>)">;
+  def vavgf : SystemZTargetBuiltin<"_Vector<4, signed int>(_Vector<4, signed 
int>, _Vector<4, signed int>)">;
+  def vavgg : SystemZTargetBuiltin<"_Vector<2, signed long long 
int>(_Vector<2, signed long long int>, _Vector<2, signed long long int>)">;
+  def vavglb : SystemZTargetBuiltin<"_Vector<16, unsigned char>(_Vector<16, 
unsigned char>, _Vector<16, unsigned char>)">;
+  def vavglh : SystemZTargetBuiltin<"_Vector<8, unsigned short>(_Vector<8, 
unsigned short>, _Vector<8, unsigned short>)">;
+  def vavglf : SystemZTargetBuiltin<"_Vector<4, unsigned int>(_Vector<4, 
unsigned int>, _Vector<4, unsigned int>)">;
+  def vavglg : SystemZTargetBuiltin<"_Vector<2, unsigned long long 
int>(_Vector<2, unsigned long long int>, _Vector<2, unsigned long long int>)">;
+  def vceqbs : SystemZTargetBuiltin<"_Vector<16, signed char>(_Vector<16, 
unsigned char>, _Vector<16, unsigned char>, int *)">;
+  def vceqhs : SystemZTargetBuiltin<"_Vector<8, signed short>(_Vector<8, 
unsigned short>, _Vector<8, unsigned short>, int *)">;
+  def vceqfs : SystemZTargetBuiltin<"_Vector<4, signed int>(_Vector<4, 
unsigned int>, _Vector<4, unsigned int>, int *)">;
+  def vceqgs : SystemZTargetBuiltin<"_Vector<2, signed long long 
int>(_Vector<2, unsigned long long int>, _Vector<2, unsigned long long int>, 
int *)">;
+  def vchbs : SystemZTargetBuiltin<"_Vector<16, signed char>(_Vector<16, 
signed char>, _Vector<16, signed char>, int *)">;
+  def vchhs : SystemZTargetBuiltin<"_Vector<8, signed short>(_Vector<8, signed 
short>, _Vector<8, signed short>, int *)">;
+  def vchfs : SystemZTargetBuiltin<"_Vector<4, signed int>(_Vector<4, signed 
int>, _Vector<4, signed int>, int *)">;
+  def vchgs : SystemZTargetBuiltin<"_Vector<2, signed long long 
int>(_Vector<2, signed long long int>, _Vector<2, signed long long int>, int 
*)">;
+  def vchlbs : SystemZTargetBuiltin<"_Vector<16, signed char>(_Vector<16, 
unsigned char>, _Vector<16, unsigned char>, int *)">;
+  def vchlhs : SystemZTargetBuiltin<"_Vector<8, signed short>(_Vector<8, 
unsigned short>, _Vector<8, unsigned short>, int *)">;
+  def vchlfs : SystemZTargetBuiltin<"_Vector<4, signed int>(_Vector<4, 
unsigned int>, _Vector<4, unsigned int>, int *)">;
+  def vchlgs : SystemZTargetBuiltin<"_Vector<2, signed long long 
int>(_Vector<2, unsigned long long int>, _Vector<2, unsigned long long int>, 
int *)">;
+  def vcksm : SystemZTargetBuiltin<"_Vector<4, unsigned int>(_Vector<4, 
unsigned int>, _Vector<4, unsigned int>)">;
+  def vclzb : SystemZTargetBuiltin<"_Vector<16, unsigned char>(_Vector<16, 
unsigned char>)">;
+  def vclzh : SystemZTargetBuiltin<"_Vector<8, unsigned short>(_Vector<8, 
unsigned short>)">;
+  def vclzf : SystemZTargetBuiltin<"_Vector<4, unsigned int>(_Vector<4, 
unsigned int>)">;
+  def vclzg : SystemZTargetBuiltin<"_Vector<2, unsigned long long 
int>(_Vector<2, unsigned long long int>)">;
+  def vctzb : SystemZTargetBuiltin<"_Vector<16, unsigned char>(_Vector<16, 
unsigned char>)">;
+  def vctzh : SystemZTargetBuiltin<"_Vector<8, unsigned short>(_Vector<8, 
unsigned short>)">;
+  def vctzf : SystemZTargetBuiltin<"_Vector<4, unsigned int>(_Vector<4, 
unsigned int>)">;
+  def vctzg : SystemZTargetBuiltin<"_Vector<2, unsigned long long 
int>(_Vector<2, unsigned long long int>)">;
+  def verimb : SystemZTargetBuiltin<"_Vector<16, unsigned char>(_Vector<16, 
unsigned char>, _Vector<16, unsigned char>, _Vector<16, unsigned char>, int)">;
+  def verimh : SystemZTargetBuiltin<"_Vector<8, unsigned short>(_Vector<8, 
unsigned short>, _Vector<8, unsigned short>, _Vector<8, unsigned short>, int)">;
+  def verimf : SystemZTargetBuiltin<"_Vector<4, unsigned int>(_Vector<4, 
unsigned int>, _Vector<4, unsigned int>, _Vector<4, unsigned int>, int)">;
+  def verimg : SystemZTargetBuiltin<"_Vector<2, unsigned long long 
int>(_Vector<2, unsigned long long int>, _Vector<2, unsigned long long int>, 
_Vector<2, unsigned long long int>, int)">;
+  def verllb : SystemZTargetBuiltin<"_Vector<16, unsigned char>(_Vector<16, 
unsigned char>, unsigned char)">;
+  def verllh : SystemZTargetBuiltin<"_Vector<8, unsigned short>(_Vector<8, 
unsigned short>, unsigned char)">;
+  def verllf : SystemZTargetBuiltin<"_Vector<4, unsigned int>(_Vector<4, 
unsigned int>, unsigned char)">;
+  def verllg : SystemZTargetBuiltin<"_Vector<2, unsigned long long 
int>(_Vector<2, unsigned long long int>, unsigned char)">;
+  def verllvb : SystemZTargetBuiltin<"_Vector<16, unsigned char>(_Vector<16, 
unsigned char>, _Vector<16, unsigned char>)">;
+  def verllvh : SystemZTargetBuiltin<"_Vector<8, unsigned short>(_Vector<8, 
unsigned short>, _Vector<8, unsigned short>)">;
+  def verllvf : SystemZTargetBuiltin<"_Vector<4, unsigned int>(_Vector<4, 
unsigned int>, _Vector<4, unsigned int>)">;
+  def verllvg : SystemZTargetBuiltin<"_Vector<2, unsigned long long 
int>(_Vector<2, unsigned long long int>, _Vector<2, unsigned long long int>)">;
+  def vgfmb : SystemZTargetBuiltin<"_Vector<8, unsigned short>(_Vector<16, 
unsigned char>, _Vector<16, unsigned char>)">;
+  def vgfmh : SystemZTargetBuiltin<"_Vector<4, unsigned int>(_Vector<8, 
unsigned short>, _Vector<8, unsigned short>)">;
+  def vgfmf : SystemZTargetBuiltin<"_Vector<2, unsigned long long 
int>(_Vector<4, unsigned int>, _Vector<4, unsigned int>)">;
+  def vgfmg : SystemZTargetBuiltin<"__uint128_t(_Vector<2, unsigned long long 
int>, _Vector<2, unsigned long long int>)">;
+  def vgfmab : SystemZTargetBuiltin<"_Vector<8, unsigned short>(_Vector<16, 
unsigned char>, _Vector<16, unsigned char>, _Vector<8, unsigned short>)">;
+  def vgfmah : SystemZTargetBuiltin<"_Vector<4, unsigned int>(_Vector<8, 
unsigned short>, _Vector<8, unsigned short>, _Vector<4, unsigned int>)">;
+  def vgfmaf : SystemZTargetBuiltin<"_Vector<2, unsigned long long 
int>(_Vector<4, unsigned int>, _Vector<4, unsigned int>, _Vector<2, unsigned 
long long int>)">;
+  def vgfmag : SystemZTargetBuiltin<"__uint128_t(_Vector<2, unsigned long long 
int>, _Vector<2, unsigned long long int>, __uint128_t)">;
+  def vmahb : SystemZTargetBuiltin<"_Vector<16, signed char>(_Vector<16, 
signed char>, _Vector<16, signed char>, _Vector<16, signed char>)">;
+  def vmahh : SystemZTargetBuiltin<"_Vector<8, signed short>(_Vector<8, signed 
short>, _Vector<8, signed short>, _Vector<8, signed short>)">;
+  def vmahf : SystemZTargetBuiltin<"_Vector<4, signed int>(_Vector<4, signed 
int>, _Vector<4, signed int>, _Vector<4, signed int>)">;
+  def vmalhb : SystemZTargetBuiltin<"_Vector<16, unsigned char>(_Vector<16, 
unsigned char>, _Vector<16, unsigned char>, _Vector<16, unsigned char>)">;
+  def vmalhh : SystemZTargetBuiltin<"_Vector<8, unsigned short>(_Vector<8, 
unsigned short>, _Vector<8, unsigned short>, _Vector<8, unsigned short>)">;
+  def vmalhf : SystemZTargetBuiltin<"_Vector<4, unsigned int>(_Vector<4, 
unsigned int>, _Vector<4, unsigned int>, _Vector<4, unsigned int>)">;
+  def vmaeb : SystemZTargetBuiltin<"_Vector<8, signed short>(_Vector<16, 
signed char>, _Vector<16, signed char>, _Vector<8, signed short>)">;
+  def vmaeh : SystemZTargetBuiltin<"_Vector<4, signed int>(_Vector<8, signed 
short>, _Vector<8, signed short>, _Vector<4, signed int>)">;
+  def vmaef : SystemZTargetBuiltin<"_Vector<2, signed long long 
int>(_Vector<4, signed int>, _Vector<4, signed int>, _Vector<2, signed long 
long int>)">;
+  def vmaleb : SystemZTargetBuiltin<"_Vector<8, unsigned short>(_Vector<16, 
unsigned char>, _Vector<16, unsigned char>, _Vector<8, unsigned short>)">;
+  def vmaleh : SystemZTargetBuiltin<"_Vector<4, unsigned int>(_Vector<8, 
unsigned short>, _Vector<8, unsigned short>, _Vector<4, unsigned int>)">;
+  def vmalef : SystemZTargetBuiltin<"_Vector<2, unsigned long long 
int>(_Vector<4, unsigned int>, _Vector<4, unsigned int>, _Vector<2, unsigned 
long long int>)">;
+  def vmaob : SystemZTargetBuiltin<"_Vector<8, signed short>(_Vector<16, 
signed char>, _Vector<16, signed char>, _Vector<8, signed short>)">;
+  def vmaoh : SystemZTargetBuiltin<"_Vector<4, signed int>(_Vector<8, signed 
short>, _Vector<8, signed short>, _Vector<4, signed int>)">;
+  def vmaof : SystemZTargetBuiltin<"_Vector<2, signed long long 
int>(_Vector<4, signed int>, _Vector<4, signed int>, _Vector<2, signed long 
long int>)">;
+  def vmalob : SystemZTargetBuiltin<"_Vector<8, unsigned short>(_Vector<16, 
unsigned char>, _Vector<16, unsigned char>, _Vector<8, unsigned short>)">;
+  def vmaloh : SystemZTargetBuiltin<"_Vector<4, unsigned int>(_Vector<8, 
unsigned short>, _Vector<8, unsigned short>, _Vector<4, unsigned int>)">;
+  def vmalof : SystemZTargetBuiltin<"_Vector<2, unsigned long long 
int>(_Vector<4, unsigned int>, _Vector<4, unsigned int>, _Vector<2, unsigned 
long long int>)">;
+  def vmhb : SystemZTargetBuiltin<"_Vector<16, signed char>(_Vector<16, signed 
char>, _Vector<16, signed char>)">;
+  def vmhh : SystemZTargetBuiltin<"_Vector<8, signed short>(_Vector<8, signed 
short>, _Vector<8, signed short>)">;
+  def vmhf : SystemZTargetBuiltin<"_Vector<4, signed int>(_Vector<4, signed 
int>, _Vector<4, signed int>)">;
+  def vmlhb : SystemZTargetBuiltin<"_Vector<16, unsigned char>(_Vector<16, 
unsigned char>, _Vector<16, unsigned char>)">;
+  def vmlhh : SystemZTargetBuiltin<"_Vector<8, unsigned short>(_Vector<8, 
unsigned short>, _Vector<8, unsigned short>)">;
+  def vmlhf : SystemZTargetBuiltin<"_Vector<4, unsigned int>(_Vector<4, 
unsigned int>, _Vector<4, unsigned int>)">;
+  def vmeb : SystemZTargetBuiltin<"_Vector<8, signed short>(_Vector<16, signed 
char>, _Vector<16, signed char>)">;
+  def vmeh : SystemZTargetBuiltin<"_Vector<4, signed int>(_Vector<8, signed 
short>, _Vector<8, signed short>)">;
+  def vmef : SystemZTargetBuiltin<"_Vector<2, signed long long int>(_Vector<4, 
signed int>, _Vector<4, signed int>)">;
+  def vmleb : SystemZTargetBuiltin<"_Vector<8, unsigned short>(_Vector<16, 
unsigned char>, _Vector<16, unsigned char>)">;
+  def vmleh : SystemZTargetBuiltin<"_Vector<4, unsigned int>(_Vector<8, 
unsigned short>, _Vector<8, unsigned short>)">;
+  def vmlef : SystemZTargetBuiltin<"_Vector<2, unsigned long long 
int>(_Vector<4, unsigned int>, _Vector<4, unsigned int>)">;
+  def vmob : SystemZTargetBuiltin<"_Vector<8, signed short>(_Vector<16, signed 
char>, _Vector<16, signed char>)">;
+  def vmoh : SystemZTargetBuiltin<"_Vector<4, signed int>(_Vector<8, signed 
short>, _Vector<8, signed short>)">;
+  def vmof : SystemZTargetBuiltin<"_Vector<2, signed long long int>(_Vector<4, 
signed int>, _Vector<4, signed int>)">;
+  def vmlob : SystemZTargetBuiltin<"_Vector<8, unsigned short>(_Vector<16, 
unsigned char>, _Vector<16, unsigned char>)">;
+  def vmloh : SystemZTargetBuiltin<"_Vector<4, unsigned int>(_Vector<8, 
unsigned short>, _Vector<8, unsigned short>)">;
+  def vmlof : SystemZTargetBuiltin<"_Vector<2, unsigned long long 
int>(_Vector<4, unsigned int>, _Vector<4, unsigned int>)">;
+  def vsq : SystemZTargetBuiltin<"__int128_t(__int128_t, __int128_t)">;
+  def vsbcbiq : SystemZTargetBuiltin<"__uint128_t(__uint128_t, __uint128_t, 
__uint128_t)">;
+  def vsbiq : SystemZTargetBuiltin<"__uint128_t(__uint128_t, __uint128_t, 
__uint128_t)">;
+  def vscbib : SystemZTargetBuiltin<"_Vector<16, unsigned char>(_Vector<16, 
unsigned char>, _Vector<16, unsigned char>)">;
+  def vscbih : SystemZTargetBuiltin<"_Vector<8, unsigned short>(_Vector<8, 
unsigned short>, _Vector<8, unsigned short>)">;
+  def vscbif : SystemZTargetBuiltin<"_Vector<4, unsigned int>(_Vector<4, 
unsigned int>, _Vector<4, unsigned int>)">;
+  def vscbig : SystemZTargetBuiltin<"_Vector<2, unsigned long long 
int>(_Vector<2, unsigned long long int>, _Vector<2, unsigned long long int>)">;
+  def vscbiq : SystemZTargetBuiltin<"__uint128_t(__uint128_t, __uint128_t)">;
+  def vsl : SystemZTargetBuiltin<"_Vector<16, unsigned char>(_Vector<16, 
unsigned char>, _Vector<16, unsigned char>)">;
+  def vslb : SystemZTargetBuiltin<"_Vector<16, unsigned char>(_Vector<16, 
unsigned char>, _Vector<16, unsigned char>)">;
+  def vsldb : SystemZTargetBuiltin<"_Vector<16, unsigned char>(_Vector<16, 
unsigned char>, _Vector<16, unsigned char>, int)">;
+  def vsra : SystemZTargetBuiltin<"_Vector<16, unsigned char>(_Vector<16, 
unsigned char>, _Vector<16, unsigned char>)">;
+  def vsrab : SystemZTargetBuiltin<"_Vector<16, unsigned char>(_Vector<16, 
unsigned char>, _Vector<16, unsigned char>)">;
+  def vsrl : SystemZTargetBuiltin<"_Vector<16, unsigned char>(_Vector<16, 
unsigned char>, _Vector<16, unsigned char>)">;
+  def vsrlb : SystemZTargetBuiltin<"_Vector<16, unsigned char>(_Vector<16, 
unsigned char>, _Vector<16, unsigned char>)">;
+  def vsumb : SystemZTargetBuiltin<"_Vector<4, unsigned int>(_Vector<16, 
unsigned char>, _Vector<16, unsigned char>)">;
+  def vsumh : SystemZTargetBuiltin<"_Vector<4, unsigned int>(_Vector<8, 
unsigned short>, _Vector<8, unsigned short>)">;
+  def vsumgh : SystemZTargetBuiltin<"_Vector<2, unsigned long long 
int>(_Vector<8, unsigned short>, _Vector<8, unsigned short>)">;
+  def vsumgf : SystemZTargetBuiltin<"_Vector<2, unsigned long long 
int>(_Vector<4, unsigned int>, _Vector<4, unsigned int>)">;
+  def vsumqf : SystemZTargetBuiltin<"__uint128_t(_Vector<4, unsigned int>, 
_Vector<4, unsigned int>)">;
+  def vsumqg : SystemZTargetBuiltin<"__uint128_t(_Vector<2, unsigned long long 
int>, _Vector<2, unsigned long long int>)">;
+  def vtm : SystemZTargetBuiltin<"int(_Vector<16, unsigned char>, _Vector<16, 
unsigned char>)">;
+}
+
+// Vector string instructions (chapter 23 of the PoP)
+let Attributes = [NoThrow, Const], Features = "vector" in {
+  def vfaeb : SystemZTargetBuiltin<"_Vector<16, unsigned char>(_Vector<16, 
unsigned char>, _Vector<16, unsigned char>, int)">;
+  def vfaebs : SystemZTargetBuiltin<"_Vector<16, unsigned char>(_Vector<16, 
unsigned char>, _Vector<16, unsigned char>, int, int *)">;
+  def vfaeh : SystemZTargetBuiltin<"_Vector<8, unsigned short>(_Vector<8, 
unsigned short>, _Vector<8, unsigned short>, int)">;
+  def vfaehs : SystemZTargetBuiltin<"_Vector<8, unsigned short>(_Vector<8, 
unsigned short>, _Vector<8, unsigned short>, int, int *)">;
+  def vfaef : SystemZTargetBuiltin<"_Vector<4, unsigned int>(_Vector<4, 
unsigned int>, _Vector<4, unsigned int>, int)">;
+  def vfaefs : SystemZTargetBuiltin<"_Vector<4, unsigned int>(_Vector<4, 
unsigned int>, _Vector<4, unsigned int>, int, int *)">;
+  def vfaezb : SystemZTargetBuiltin<"_Vector<16, unsigned char>(_Vector<16, 
unsigned char>, _Vector<16, unsigned char>, int)">;
+  def vfaezbs : SystemZTargetBuiltin<"_Vector<16, unsigned char>(_Vector<16, 
unsigned char>, _Vector<16, unsigned char>, int, int *)">;
+  def vfaezh : SystemZTargetBuiltin<"_Vector<8, unsigned short>(_Vector<8, 
unsigned short>, _Vector<8, unsigned short>, int)">;
+  def vfaezhs : SystemZTargetBuiltin<"_Vector<8, unsigned short>(_Vector<8, 
unsigned short>, _Vector<8, unsigned short>, int, int *)">;
+  def vfaezf : SystemZTargetBuiltin<"_Vector<4, unsigned int>(_Vector<4, 
unsigned int>, _Vector<4, unsigned int>, int)">;
+  def vfaezfs : SystemZTargetBuiltin<"_Vector<4, unsigned int>(_Vector<4, 
unsigned int>, _Vector<4, unsigned int>, int, int *)">;
+  def vfeeb : SystemZTargetBuiltin<"_Vector<16, unsigned char>(_Vector<16, 
unsigned char>, _Vector<16, unsigned char>)">;
+  def vfeebs : SystemZTargetBuiltin<"_Vector<16, unsigned char>(_Vector<16, 
unsigned char>, _Vector<16, unsigned char>, int *)">;
+  def vfeeh : SystemZTargetBuiltin<"_Vector<8, unsigned short>(_Vector<8, 
unsigned short>, _Vector<8, unsigned short>)">;
+  def vfeehs : SystemZTargetBuiltin<"_Vector<8, unsigned short>(_Vector<8, 
unsigned short>, _Vector<8, unsigned short>, int *)">;
+  def vfeef : SystemZTargetBuiltin<"_Vector<4, unsigned int>(_Vector<4, 
unsigned int>, _Vector<4, unsigned int>)">;
+  def vfeefs : SystemZTargetBuiltin<"_Vector<4, unsigned int>(_Vector<4, 
unsigned int>, _Vector<4, unsigned int>, int *)">;
+  def vfeezb : SystemZTargetBuiltin<"_Vector<16, unsigned char>(_Vector<16, 
unsigned char>, _Vector<16, unsigned char>)">;
+  def vfeezbs : SystemZTargetBuiltin<"_Vector<16, unsigned char>(_Vector<16, 
unsigned char>, _Vector<16, unsigned char>, int *)">;
+  def vfeezh : SystemZTargetBuiltin<"_Vector<8, unsigned short>(_Vector<8, 
unsigned short>, _Vector<8, unsigned short>)">;
+  def vfeezhs : SystemZTargetBuiltin<"_Vector<8, unsigned short>(_Vector<8, 
unsigned short>, _Vector<8, unsigned short>, int *)">;
+  def vfeezf : SystemZTargetBuiltin<"_Vector<4, unsigned int>(_Vector<4, 
unsigned int>, _Vector<4, unsigned int>)">;
+  def vfeezfs : SystemZTargetBuiltin<"_Vector<4, unsigned int>(_Vector<4, 
unsigned int>, _Vector<4, unsigned int>, int *)">;
+  def vfeneb : SystemZTargetBuiltin<"_Vector<16, unsigned char>(_Vector<16, 
unsigned char>, _Vector<16, unsigned char>)">;
+  def vfenebs : SystemZTargetBuiltin<"_Vector<16, unsigned char>(_Vector<16, 
unsigned char>, _Vector<16, unsigned char>, int *)">;
+  def vfeneh : SystemZTargetBuiltin<"_Vector<8, unsigned short>(_Vector<8, 
unsigned short>, _Vector<8, unsigned short>)">;
+  def vfenehs : SystemZTargetBuiltin<"_Vector<8, unsigned short>(_Vector<8, 
unsigned short>, _Vector<8, unsigned short>, int *)">;
+  def vfenef : SystemZTargetBuiltin<"_Vector<4, unsigned int>(_Vector<4, 
unsigned int>, _Vector<4, unsigned int>)">;
+  def vfenefs : SystemZTargetBuiltin<"_Vector<4, unsigned int>(_Vector<4, 
unsigned int>, _Vector<4, unsigned int>, int *)">;
+  def vfenezb : SystemZTargetBuiltin<"_Vector<16, unsigned char>(_Vector<16, 
unsigned char>, _Vector<16, unsigned char>)">;
+  def vfenezbs : SystemZTargetBuiltin<"_Vector<16, unsigned char>(_Vector<16, 
unsigned char>, _Vector<16, unsigned char>, int *)">;
+  def vfenezh : SystemZTargetBuiltin<"_Vector<8, unsigned short>(_Vector<8, 
unsigned short>, _Vector<8, unsigned short>)">;
+  def vfenezhs : SystemZTargetBuiltin<"_Vector<8, unsigned short>(_Vector<8, 
unsigned short>, _Vector<8, unsigned short>, int *)">;
+  def vfenezf : SystemZTargetBuiltin<"_Vector<4, unsigned int>(_Vector<4, 
unsigned int>, _Vector<4, unsigned int>)">;
+  def vfenezfs : SystemZTargetBuiltin<"_Vector<4, unsigned int>(_Vector<4, 
unsigned int>, _Vector<4, unsigned int>, int *)">;
+  def vistrb : SystemZTargetBuiltin<"_Vector<16, unsigned char>(_Vector<16, 
unsigned char>)">;
+  def vistrbs : SystemZTargetBuiltin<"_Vector<16, unsigned char>(_Vector<16, 
unsigned char>, int *)">;
+  def vistrh : SystemZTargetBuiltin<"_Vector<8, unsigned short>(_Vector<8, 
unsigned short>)">;
+  def vistrhs : SystemZTargetBuiltin<"_Vector<8, unsigned short>(_Vector<8, 
unsigned short>, int *)">;
+  def vistrf : SystemZTargetBuiltin<"_Vector<4, unsigned int>(_Vector<4, 
unsigned int>)">;
+  def vistrfs : SystemZTargetBuiltin<"_Vector<4, unsigned int>(_Vector<4, 
unsigned int>, int *)">;
+  def vstrcb : SystemZTargetBuiltin<"_Vector<16, unsigned char>(_Vector<16, 
unsigned char>, _Vector<16, unsigned char>, _Vector<16, unsigned char>, int)">;
+  def vstrcbs : SystemZTargetBuiltin<"_Vector<16, unsigned char>(_Vector<16, 
unsigned char>, _Vector<16, unsigned char>, _Vector<16, unsigned char>, int, 
int *)">;
+  def vstrch : SystemZTargetBuiltin<"_Vector<8, unsigned short>(_Vector<8, 
unsigned short>, _Vector<8, unsigned short>, _Vector<8, unsigned short>, int)">;
+  def vstrchs : SystemZTargetBuiltin<"_Vector<8, unsigned short>(_Vector<8, 
unsigned short>, _Vector<8, unsigned short>, _Vector<8, unsigned short>, int, 
int *)">;
+  def vstrcf : SystemZTargetBuiltin<"_Vector<4, unsigned int>(_Vector<4, 
unsigned int>, _Vector<4, unsigned int>, _Vector<4, unsigned int>, int)">;
+  def vstrcfs : SystemZTargetBuiltin<"_Vector<4, unsigned int>(_Vector<4, 
unsigned int>, _Vector<4, unsigned int>, _Vector<4, unsigned int>, int, int 
*)">;
+  def vstrczb : SystemZTargetBuiltin<"_Vector<16, unsigned char>(_Vector<16, 
unsigned char>, _Vector<16, unsigned char>, _Vector<16, unsigned char>, int)">;
+  def vstrczbs : SystemZTargetBuiltin<"_Vector<16, unsigned char>(_Vector<16, 
unsigned char>, _Vector<16, unsigned char>, _Vector<16, unsigned char>, int, 
int *)">;
+  def vstrczh : SystemZTargetBuiltin<"_Vector<8, unsigned short>(_Vector<8, 
unsigned short>, _Vector<8, unsigned short>, _Vector<8, unsigned short>, int)">;
+  def vstrczhs : SystemZTargetBuiltin<"_Vector<8, unsigned short>(_Vector<8, 
unsigned short>, _Vector<8, unsigned short>, _Vector<8, unsigned short>, int, 
int *)">;
+  def vstrczf : SystemZTargetBuiltin<"_Vector<4, unsigned int>(_Vector<4, 
unsigned int>, _Vector<4, unsigned int>, _Vector<4, unsigned int>, int)">;
+  def vstrczfs : SystemZTargetBuiltin<"_Vector<4, unsigned int>(_Vector<4, 
unsigned int>, _Vector<4, unsigned int>, _Vector<4, unsigned int>, int, int 
*)">;
+}
+
+// Vector floating-point instructions (chapter 24 of the PoP)
+let Attributes = [NoThrow, Const], Features = "vector" in {
+  def vfcedbs : SystemZTargetBuiltin<"_Vector<2, signed long long 
int>(_Vector<2, double>, _Vector<2, double>, int *)">;
+  def vfchdbs : SystemZTargetBuiltin<"_Vector<2, signed long long 
int>(_Vector<2, double>, _Vector<2, double>, int *)">;
+  def vfchedbs : SystemZTargetBuiltin<"_Vector<2, signed long long 
int>(_Vector<2, double>, _Vector<2, double>, int *)">;
+  def vfidb : SystemZTargetBuiltin<"_Vector<2, double>(_Vector<2, double>, 
int, int)">;
+  def vflndb : SystemZTargetBuiltin<"_Vector<2, double>(_Vector<2, double>)">;
+  def vflpdb : SystemZTargetBuiltin<"_Vector<2, double>(_Vector<2, double>)">;
+  def vfmadb : SystemZTargetBuiltin<"_Vector<2, double>(_Vector<2, double>, 
_Vector<2, double>, _Vector<2, double>)">;
+  def vfmsdb : SystemZTargetBuiltin<"_Vector<2, double>(_Vector<2, double>, 
_Vector<2, double>, _Vector<2, double>)">;
+  def vfsqdb : SystemZTargetBuiltin<"_Vector<2, double>(_Vector<2, double>)">;
+  def vftcidb : SystemZTargetBuiltin<"_Vector<2, signed long long 
int>(_Vector<2, double>, int, int *)">;
+}
+
+// Vector-enhancements facility 1 intrinsics.
+let Features = "vector-enhancements-1" in {
+  def vlrlr : SystemZTargetBuiltin<"_Vector<16, signed char>(unsigned int, 
void const *)">;
+  def vstrlr : SystemZTargetBuiltin<"void(_Vector<16, signed char>, unsigned 
int, void *)">;
+}
+let Attributes = [NoThrow, Const], Features = "vector-enhancements-1" in {
+  def vbperm : SystemZTargetBuiltin<"_Vector<2, unsigned long long 
int>(_Vector<16, unsigned char>, _Vector<16, unsigned char>)">;
+  def vmslg : SystemZTargetBuiltin<"__uint128_t(_Vector<2, unsigned long long 
int>, _Vector<2, unsigned long long int>, __uint128_t, int)">;
+  def vfmaxdb : SystemZTargetBuiltin<"_Vector<2, double>(_Vector<2, double>, 
_Vector<2, double>, int)">;
+  def vfmindb : SystemZTargetBuiltin<"_Vector<2, double>(_Vector<2, double>, 
_Vector<2, double>, int)">;
+  def vfnmadb : SystemZTargetBuiltin<"_Vector<2, double>(_Vector<2, double>, 
_Vector<2, double>, _Vector<2, double>)">;
+  def vfnmsdb : SystemZTargetBuiltin<"_Vector<2, double>(_Vector<2, double>, 
_Vector<2, double>, _Vector<2, double>)">;
+  def vfcesbs : SystemZTargetBuiltin<"_Vector<4, signed int>(_Vector<4, 
float>, _Vector<4, float>, int *)">;
+  def vfchsbs : SystemZTargetBuiltin<"_Vector<4, signed int>(_Vector<4, 
float>, _Vector<4, float>, int *)">;
+  def vfchesbs : SystemZTargetBuiltin<"_Vector<4, signed int>(_Vector<4, 
float>, _Vector<4, float>, int *)">;
+  def vfisb : SystemZTargetBuiltin<"_Vector<4, float>(_Vector<4, float>, int, 
int)">;
+  def vfmaxsb : SystemZTargetBuiltin<"_Vector<4, float>(_Vector<4, float>, 
_Vector<4, float>, int)">;
+  def vfminsb : SystemZTargetBuiltin<"_Vector<4, float>(_Vector<4, float>, 
_Vector<4, float>, int)">;
+  def vflnsb : SystemZTargetBuiltin<"_Vector<4, float>(_Vector<4, float>)">;
+  def vflpsb : SystemZTargetBuiltin<"_Vector<4, float>(_Vector<4, float>)">;
+  def vfmasb : SystemZTargetBuiltin<"_Vector<4, float>(_Vector<4, float>, 
_Vector<4, float>, _Vector<4, float>)">;
+  def vfmssb : SystemZTargetBuiltin<"_Vector<4, float>(_Vector<4, float>, 
_Vector<4, float>, _Vector<4, float>)">;
+  def vfnmasb : SystemZTargetBuiltin<"_Vector<4, float>(_Vector<4, float>, 
_Vector<4, float>, _Vector<4, float>)">;
+  def vfnmssb : SystemZTargetBuiltin<"_Vector<4, float>(_Vector<4, float>, 
_Vector<4, float>, _Vector<4, float>)">;
+  def vfsqsb : SystemZTargetBuiltin<"_Vector<4, float>(_Vector<4, float>)">;
+  def vftcisb : SystemZTargetBuiltin<"_Vector<4, signed int>(_Vector<4, 
float>, int, int *)">;
+}
+
+// Vector-enhancements facility 2 intrinsics.
+let Attributes = [NoThrow, Const], Features = "vector-enhancements-2" in {
+  def vsld : SystemZTargetBuiltin<"_Vector<16, unsigned char>(_Vector<16, 
unsigned char>, _Vector<16, unsigned char>, int)">;
+  def vsrd : SystemZTargetBuiltin<"_Vector<16, unsigned char>(_Vector<16, 
unsigned char>, _Vector<16, unsigned char>, int)">;
+  def vstrsb : SystemZTargetBuiltin<"_Vector<16, unsigned char>(_Vector<16, 
unsigned char>, _Vector<16, unsigned char>, _Vector<16, unsigned char>, int 
*)">;
+  def vstrsh : SystemZTargetBuiltin<"_Vector<16, unsigned char>(_Vector<8, 
unsigned short>, _Vector<8, unsigned short>, _Vector<16, unsigned char>, int 
*)">;
+  def vstrsf : SystemZTargetBuiltin<"_Vector<16, unsigned char>(_Vector<4, 
unsigned int>, _Vector<4, unsigned int>, _Vector<16, unsigned char>, int *)">;
+  def vstrszb : SystemZTargetBuiltin<"_Vector<16, unsigned char>(_Vector<16, 
unsigned char>, _Vector<16, unsigned char>, _Vector<16, unsigned char>, int 
*)">;
+  def vstrszh : SystemZTargetBuiltin<"_Vector<16, unsigned char>(_Vector<8, 
unsigned short>, _Vector<8, unsigned short>, _Vector<16, unsigned char>, int 
*)">;
+  def vstrszf : SystemZTargetBuiltin<"_Vector<16, unsigned char>(_Vector<4, 
unsigned int>, _Vector<4, unsigned int>, _Vector<16, unsigned char>, int *)">;
+}
+
+// Helpers to implement vec_revb.
+let Attributes = [NoThrow, Const], Features = "vector" in {
+  def vlbrh : SystemZTargetBuiltin<"_Vector<8, unsigned short>(_Vector<8, 
unsigned short>)">;
+  def vlbrf : SystemZTargetBuiltin<"_Vector<4, unsigned int>(_Vector<4, 
unsigned int>)">;
+  def vlbrg : SystemZTargetBuiltin<"_Vector<2, unsigned long long 
int>(_Vector<2, unsigned long long int>)">;
+  def vlbrq : SystemZTargetBuiltin<"__uint128_t(__uint128_t)">;
+}
+
+// NNP-assist facility intrinsics.
+let Attributes = [NoThrow, Const], Features = "nnp-assist" in {
+  def vclfnhs : SystemZTargetBuiltin<"_Vector<4, float>(_Vector<8, unsigned 
short>, int)">;
+  def vclfnls : SystemZTargetBuiltin<"_Vector<4, float>(_Vector<8, unsigned 
short>, int)">;
+  def vcrnfs : SystemZTargetBuiltin<"_Vector<8, unsigned short>(_Vector<4, 
float>, _Vector<4, float>, int)">;
+  def vcfn : SystemZTargetBuiltin<"_Vector<8, unsigned short>(_Vector<8, 
unsigned short>, int)">;
+  def vcnf : SystemZTargetBuiltin<"_Vector<8, unsigned short>(_Vector<8, 
unsigned short>, int)">;
+}
+
+// Miscellaneous instruction extensions facility 4 intrinsics.
+let Attributes = [NoThrow, Const], Features = "miscellaneous-extensions-4" in {
+  def bdepg : SystemZTargetBuiltin<"unsigned long int(unsigned long int, 
unsigned long int)">;
+  def bextg : SystemZTargetBuiltin<"unsigned long int(unsigned long int, 
unsigned long int)">;
+}
+
+// Vector-enhancements facility 3 intrinsics.
+let Attributes = [NoThrow, Const], Features = "vector-enhancements-3" in {
+  def vgemb : SystemZTargetBuiltin<"_Vector<16, unsigned char>(_Vector<8, 
unsigned short>)">;
+  def vgemh : SystemZTargetBuiltin<"_Vector<8, unsigned short>(_Vector<16, 
unsigned char>)">;
+  def vgemf : SystemZTargetBuiltin<"_Vector<4, unsigned int>(_Vector<16, 
unsigned char>)">;
+  def vgemg : SystemZTargetBuiltin<"_Vector<2, unsigned long long 
int>(_Vector<16, unsigned char>)">;
+  def vgemq : SystemZTargetBuiltin<"__uint128_t(_Vector<16, unsigned char>)">;
+  def vuplg : SystemZTargetBuiltin<"__int128_t(_Vector<2, signed long long 
int>)">;
+  def vupllg : SystemZTargetBuiltin<"__uint128_t(_Vector<2, unsigned long long 
int>)">;
+  def vuphg : SystemZTargetBuiltin<"__int128_t(_Vector<2, signed long long 
int>)">;
+  def vuplhg : SystemZTargetBuiltin<"__uint128_t(_Vector<2, unsigned long long 
int>)">;
+  def vavgq : SystemZTargetBuiltin<"__int128_t(__int128_t, __int128_t)">;
+  def vavglq : SystemZTargetBuiltin<"__uint128_t(__uint128_t, __uint128_t)">;
+  def veval : SystemZTargetBuiltin<"_Vector<16, unsigned char>(_Vector<16, 
unsigned char>, _Vector<16, unsigned char>, _Vector<16, unsigned char>, int)">;
+  def vmahg : SystemZTargetBuiltin<"_Vector<2, signed long long 
int>(_Vector<2, signed long long int>, _Vector<2, signed long long int>, 
_Vector<2, signed long long int>)">;
+  def vmahq : SystemZTargetBuiltin<"__int128_t(__int128_t, __int128_t, 
__int128_t)">;
+  def vmalhg : SystemZTargetBuiltin<"_Vector<2, unsigned long long 
int>(_Vector<2, unsigned long long int>, _Vector<2, unsigned long long int>, 
_Vector<2, unsigned long long int>)">;
+  def vmalhq : SystemZTargetBuiltin<"__uint128_t(__uint128_t, __uint128_t, 
__uint128_t)">;
+  def vmaeg : SystemZTargetBuiltin<"__int128_t(_Vector<2, signed long long 
int>, _Vector<2, signed long long int>, __int128_t)">;
+  def vmaleg : SystemZTargetBuiltin<"__uint128_t(_Vector<2, unsigned long long 
int>, _Vector<2, unsigned long long int>, __uint128_t)">;
+  def vmaog : SystemZTargetBuiltin<"__int128_t(_Vector<2, signed long long 
int>, _Vector<2, signed long long int>, __int128_t)">;
+  def vmalog : SystemZTargetBuiltin<"__uint128_t(_Vector<2, unsigned long long 
int>, _Vector<2, unsigned long long int>, __uint128_t)">;
+  def vmhg : SystemZTargetBuiltin<"_Vector<2, signed long long int>(_Vector<2, 
signed long long int>, _Vector<2, signed long long int>)">;
+  def vmhq : SystemZTargetBuiltin<"__int128_t(__int128_t, __int128_t)">;
+  def vmlhg : SystemZTargetBuiltin<"_Vector<2, unsigned long long 
int>(_Vector<2, unsigned long long int>, _Vector<2, unsigned long long int>)">;
+  def vmlhq : SystemZTargetBuiltin<"__uint128_t(__uint128_t, __uint128_t)">;
+  def vmeg : SystemZTargetBuiltin<"__int128_t(_Vector<2, signed long long 
int>, _Vector<2, signed long long int>)">;
+  def vmleg : SystemZTargetBuiltin<"__uint128_t(_Vector<2, unsigned long long 
int>, _Vector<2, unsigned long long int>)">;
+  def vmog : SystemZTargetBuiltin<"__int128_t(_Vector<2, signed long long 
int>, _Vector<2, signed long long int>)">;
+  def vmlog : SystemZTargetBuiltin<"__uint128_t(_Vector<2, unsigned long long 
int>, _Vector<2, unsigned long long int>)">;
+  def vceqqs : SystemZTargetBuiltin<"__int128_t(__uint128_t, __uint128_t, int 
*)">;
+  def vchqs : SystemZTargetBuiltin<"__int128_t(__int128_t, __int128_t, int 
*)">;
+  def vchlqs : SystemZTargetBuiltin<"__int128_t(__uint128_t, __uint128_t, int 
*)">;
+  def vclzq : SystemZTargetBuiltin<"__uint128_t(__uint128_t)">;
+  def vctzq : SystemZTargetBuiltin<"__uint128_t(__uint128_t)">;
+}

diff  --git a/clang/include/clang/Basic/CMakeLists.txt 
b/clang/include/clang/Basic/CMakeLists.txt
index 9408277c04fe7..20172622ca424 100644
--- a/clang/include/clang/Basic/CMakeLists.txt
+++ b/clang/include/clang/Basic/CMakeLists.txt
@@ -134,6 +134,10 @@ clang_tablegen(BuiltinsSPIRVCL.inc -gen-clang-builtins
   SOURCE BuiltinsSPIRVCL.td
   TARGET ClangBuiltinsSPIRVCL)
 
+clang_tablegen(BuiltinsSystemZ.inc -gen-clang-builtins
+  SOURCE BuiltinsSystemZ.td
+  TARGET ClangBuiltinsSystemZ)
+
 clang_tablegen(BuiltinsX86.inc -gen-clang-builtins
   SOURCE BuiltinsX86.td
   TARGET ClangBuiltinsX86)

diff  --git a/clang/include/clang/Basic/TargetBuiltins.h 
b/clang/include/clang/Basic/TargetBuiltins.h
index 63fb470ea6a4f..ae4bcdb9eeb64 100644
--- a/clang/include/clang/Basic/TargetBuiltins.h
+++ b/clang/include/clang/Basic/TargetBuiltins.h
@@ -456,8 +456,9 @@ namespace clang {
   namespace SystemZ {
     enum {
         LastTIBuiltin = clang::Builtin::FirstTSBuiltin-1,
-#define BUILTIN(ID, TYPE, ATTRS) BI##ID,
-#include "clang/Basic/BuiltinsSystemZ.def"
+#define GET_BUILTIN_ENUMERATORS
+#include "clang/Basic/BuiltinsSystemZ.inc"
+#undef GET_BUILTIN_ENUMERATORS
         LastTSBuiltin
     };
   }

diff  --git a/clang/include/module.modulemap b/clang/include/module.modulemap
index ebc26fffc37f9..62a3ba104b0df 100644
--- a/clang/include/module.modulemap
+++ b/clang/include/module.modulemap
@@ -48,7 +48,6 @@ module Clang_Basic {
   textual header "clang/Basic/BuiltinsLoongArchLSX.def"
   textual header "clang/Basic/BuiltinsMips.def"
   textual header "clang/Basic/BuiltinsPPC.def"
-  textual header "clang/Basic/BuiltinsSystemZ.def"
   textual header "clang/Basic/BuiltinsVE.def"
   textual header "clang/Basic/BuiltinsVEVL.gen.def"
   textual header "clang/Basic/BuiltinsWebAssembly.def"

diff  --git a/clang/lib/Basic/Targets/SystemZ.cpp 
b/clang/lib/Basic/Targets/SystemZ.cpp
index ecd12ed34a20c..750629ac94f87 100644
--- a/clang/lib/Basic/Targets/SystemZ.cpp
+++ b/clang/lib/Basic/Targets/SystemZ.cpp
@@ -24,18 +24,23 @@ using namespace clang::targets;
 static constexpr int NumBuiltins =
     clang::SystemZ::LastTSBuiltin - Builtin::FirstTSBuiltin;
 
-static constexpr llvm::StringTable BuiltinStrings =
-    CLANG_BUILTIN_STR_TABLE_START
-#define BUILTIN CLANG_BUILTIN_STR_TABLE
-#define TARGET_BUILTIN CLANG_TARGET_BUILTIN_STR_TABLE
-#include "clang/Basic/BuiltinsSystemZ.def"
-    ;
-
-static constexpr auto BuiltinInfos = Builtin::MakeInfos<NumBuiltins>({
-#define BUILTIN CLANG_BUILTIN_ENTRY
-#define TARGET_BUILTIN CLANG_TARGET_BUILTIN_ENTRY
-#include "clang/Basic/BuiltinsSystemZ.def"
-});
+#define GET_BUILTIN_STR_TABLE
+#include "clang/Basic/BuiltinsSystemZ.inc"
+#undef GET_BUILTIN_STR_TABLE
+
+static constexpr Builtin::Info BuiltinInfos[] = {
+#define GET_BUILTIN_INFOS
+#include "clang/Basic/BuiltinsSystemZ.inc"
+#undef GET_BUILTIN_INFOS
+};
+
+static constexpr Builtin::Info PrefixedBuiltinInfos[] = {
+#define GET_BUILTIN_PREFIXED_INFOS
+#include "clang/Basic/BuiltinsSystemZ.inc"
+#undef GET_BUILTIN_PREFIXED_INFOS
+};
+static_assert((std::size(BuiltinInfos) + std::size(PrefixedBuiltinInfos)) ==
+              NumBuiltins);
 
 const char *const SystemZTargetInfo::GCCRegNames[] = {
     "r0",  "r1",  "r2",  "r3",  "r4",  "r5",  "r6",  "r7",
@@ -211,5 +216,6 @@ void SystemZTargetInfo::getTargetDefines(const LangOptions 
&Opts,
 
 llvm::SmallVector<Builtin::InfosShard>
 SystemZTargetInfo::getTargetBuiltins() const {
-  return {{&BuiltinStrings, BuiltinInfos}};
+  return {{&BuiltinStrings, BuiltinInfos},
+          {&BuiltinStrings, PrefixedBuiltinInfos, "__builtin_s390_"}};
 }

diff  --git a/clang/utils/TableGen/ClangBuiltinsEmitter.cpp 
b/clang/utils/TableGen/ClangBuiltinsEmitter.cpp
index 792e550085baf..c2e38c0d6aeb8 100644
--- a/clang/utils/TableGen/ClangBuiltinsEmitter.cpp
+++ b/clang/utils/TableGen/ClangBuiltinsEmitter.cpp
@@ -348,6 +348,7 @@ class PrototypeParser {
                                .Case("__amdgpu_feature_predicate_t", "Qc")
                                .Case("__amdgpu_texture_t", "Qt")
                                .Case("__int128_t", "LLLi")
+                               .Case("__uint128_t", "ULLLi")
                                .Case("_Float16", "x")
                                .Case("__bf16", "y")
                                .Case("bool", "b")


        
_______________________________________________
cfe-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

Reply via email to