From a6f855d31dacda6b868ea7fc20d546724e566d46 Mon Sep 17 00:00:00 2001 From: Florian Hahn Date: Mon, 18 Jan 2021 17:49:05 +0000 Subject: [PATCH] [AArch64] Revert back to Intrinsic<> for TME instructions. This patch reverts back to Intrinsic for the instructions for the transactional memory extension, so nosync is not included. --- include/llvm/IR/IntrinsicsAArch64.td | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/include/llvm/IR/IntrinsicsAArch64.td b/include/llvm/IR/IntrinsicsAArch64.td index 9de3e8d732d..da3085171b1 100644 --- a/include/llvm/IR/IntrinsicsAArch64.td +++ b/include/llvm/IR/IntrinsicsAArch64.td @@ -811,16 +811,16 @@ def int_aarch64_stgp : DefaultAttrsIntrinsic<[], [llvm_ptr_ty, llvm_i64_ty, llv // Transactional Memory Extension (TME) Intrinsics let TargetPrefix = "aarch64" in { def int_aarch64_tstart : GCCBuiltin<"__builtin_arm_tstart">, - DefaultAttrsIntrinsic<[llvm_i64_ty]>; + Intrinsic<[llvm_i64_ty], [], [IntrWillReturn]>; -def int_aarch64_tcommit : GCCBuiltin<"__builtin_arm_tcommit">, DefaultAttrsIntrinsic<[]>; +def int_aarch64_tcommit : GCCBuiltin<"__builtin_arm_tcommit">, Intrinsic<[], [], [IntrWillReturn]>; def int_aarch64_tcancel : GCCBuiltin<"__builtin_arm_tcancel">, - DefaultAttrsIntrinsic<[], [llvm_i64_ty], [ImmArg>]>; + Intrinsic<[], [llvm_i64_ty], [IntrWillReturn, ImmArg>]>; def int_aarch64_ttest : GCCBuiltin<"__builtin_arm_ttest">, - DefaultAttrsIntrinsic<[llvm_i64_ty], [], - [IntrNoMem, IntrHasSideEffects]>; + Intrinsic<[llvm_i64_ty], [], + [IntrNoMem, IntrHasSideEffects, IntrWillReturn]>; // Armv8.7-A load/store 64-byte intrinsics defvar data512 = !listsplat(llvm_i64_ty, 8);