sdesmalen updated this revision to Diff 245127.
sdesmalen added a comment.
- Inlined function into switch statement
- Removed changes to IRTranslator.cpp from this patch.
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D74724/new/
https://reviews.llvm.org/D74724
Files:
clang/lib/CodeGen/CGDecl.cpp
clang/lib/CodeGen/CodeGenTypes.cpp
clang/test/CodeGen/aarch64-sve.c
Index: clang/test/CodeGen/aarch64-sve.c
===================================================================
--- clang/test/CodeGen/aarch64-sve.c
+++ clang/test/CodeGen/aarch64-sve.c
@@ -1,9 +1,51 @@
// RUN: not %clang_cc1 -triple aarch64-none-linux-gnu -target-feature +sve \
-// RUN: -emit-llvm -o - %s -debug-info-kind=limited 2>&1 | FileCheck %s
+// RUN: -emit-llvm -o - %s -debug-info-kind=limited 2>&1 | FileCheck %s -check-prefix=CHECK-DEBUG
+// RUN: %clang_cc1 -triple aarch64-none-linux-gnu -target-feature +sve \
+// RUN: -emit-llvm -o - %s 2>&1 | FileCheck %s -check-prefix=CHECK
-// Placeholder test for SVE types
+// CHECK-DEBUG: cannot yet generate debug info for SVE type '__SVInt8_t'
+// CHECK-DEBUG: cannot yet generate debug info for SVE type '__SVInt16_t'
+// CHECK-DEBUG: cannot yet generate debug info for SVE type '__SVInt32_t'
+// CHECK-DEBUG: cannot yet generate debug info for SVE type '__SVInt64_t'
+// CHECK-DEBUG: cannot yet generate debug info for SVE type '__SVUint8_t'
+// CHECK-DEBUG: cannot yet generate debug info for SVE type '__SVUint16_t'
+// CHECK-DEBUG: cannot yet generate debug info for SVE type '__SVUint32_t'
+// CHECK-DEBUG: cannot yet generate debug info for SVE type '__SVUint64_t'
+// CHECK-DEBUG: cannot yet generate debug info for SVE type '__SVFloat16_t'
+// CHECK-DEBUG: cannot yet generate debug info for SVE type '__SVFloat32_t'
+// CHECK-DEBUG: cannot yet generate debug info for SVE type '__SVFloat64_t'
+// CHECK-DEBUG: cannot yet generate debug info for SVE type '__SVBool_t'
-// CHECK: cannot yet generate code for SVE type '__SVInt8_t'
-// CHECK: cannot yet generate debug info for SVE type '__SVInt8_t'
+// CHECK: @ptr = common global <vscale x 16 x i8>* null, align 8
+// CHECK: %s8 = alloca <vscale x 16 x i8>, align 16
+// CHECK: %s16 = alloca <vscale x 8 x i16>, align 16
+// CHECK: %s32 = alloca <vscale x 4 x i32>, align 16
+// CHECK: %s64 = alloca <vscale x 2 x i64>, align 16
+// CHECK: %u8 = alloca <vscale x 16 x i8>, align 16
+// CHECK: %u16 = alloca <vscale x 8 x i16>, align 16
+// CHECK: %u32 = alloca <vscale x 4 x i32>, align 16
+// CHECK: %u64 = alloca <vscale x 2 x i64>, align 16
+// CHECK: %f16 = alloca <vscale x 8 x half>, align 16
+// CHECK: %f32 = alloca <vscale x 4 x float>, align 16
+// CHECK: %f64 = alloca <vscale x 2 x double>, align 16
+// CHECK: %b8 = alloca <vscale x 16 x i1>, align 2
__SVInt8_t *ptr;
+
+void test_locals(void) {
+ __SVInt8_t s8;
+ __SVInt16_t s16;
+ __SVInt32_t s32;
+ __SVInt64_t s64;
+
+ __SVUint8_t u8;
+ __SVUint16_t u16;
+ __SVUint32_t u32;
+ __SVUint64_t u64;
+
+ __SVFloat16_t f16;
+ __SVFloat32_t f32;
+ __SVFloat64_t f64;
+
+ __SVBool_t b8;
+}
Index: clang/lib/CodeGen/CodeGenTypes.cpp
===================================================================
--- clang/lib/CodeGen/CodeGenTypes.cpp
+++ clang/lib/CodeGen/CodeGenTypes.cpp
@@ -511,23 +511,44 @@
case BuiltinType::OCLReserveID:
ResultType = CGM.getOpenCLRuntime().convertOpenCLSpecificType(Ty);
break;
-
- // TODO: real CodeGen support for SVE types requires more infrastructure
- // to be added first. Report an error until then.
-#define SVE_TYPE(Name, Id, SingletonId) case BuiltinType::Id:
-#include "clang/Basic/AArch64SVEACLETypes.def"
- {
- unsigned DiagID = CGM.getDiags().getCustomDiagID(
- DiagnosticsEngine::Error,
- "cannot yet generate code for SVE type '%0'");
- auto *BT = cast<BuiltinType>(Ty);
- auto Name = BT->getName(CGM.getContext().getPrintingPolicy());
- CGM.getDiags().Report(DiagID) << Name;
- // Return something safe.
- ResultType = llvm::IntegerType::get(getLLVMContext(), 32);
+ case BuiltinType::SveInt8:
+ case BuiltinType::SveUint8:
+ return llvm::VectorType::get(llvm::IntegerType::get(getLLVMContext(), 8),
+ {16, true});
+ case BuiltinType::SveInt16:
+ case BuiltinType::SveUint16:
+ return llvm::VectorType::get(llvm::IntegerType::get(getLLVMContext(), 16),
+ {8, true});
+ case BuiltinType::SveInt32:
+ case BuiltinType::SveUint32:
+ return llvm::VectorType::get(llvm::IntegerType::get(getLLVMContext(), 32),
+ {4, true});
+ case BuiltinType::SveInt64:
+ case BuiltinType::SveUint64:
+ return llvm::VectorType::get(llvm::IntegerType::get(getLLVMContext(), 64),
+ {2, true});
+ case BuiltinType::SveFloat16:
+ return llvm::VectorType::get(
+ getTypeForFormat(getLLVMContext(),
+ Context.getFloatTypeSemantics(Context.HalfTy),
+ /* UseNativeHalf = */ true),
+ {8, true});
+ case BuiltinType::SveFloat32:
+ return llvm::VectorType::get(
+ getTypeForFormat(getLLVMContext(),
+ Context.getFloatTypeSemantics(Context.FloatTy),
+ /* UseNativeHalf = */ false),
+ {4, true});
+ case BuiltinType::SveFloat64:
+ return llvm::VectorType::get(
+ getTypeForFormat(getLLVMContext(),
+ Context.getFloatTypeSemantics(Context.DoubleTy),
+ /* UseNativeHalf = */ false),
+ {2, true});
+ case BuiltinType::SveBool:
+ return llvm::VectorType::get(llvm::IntegerType::get(getLLVMContext(), 1),
+ {16, true});
break;
- }
-
case BuiltinType::Dependent:
#define BUILTIN_TYPE(Id, SingletonId)
#define PLACEHOLDER_TYPE(Id, SingletonId) \
Index: clang/lib/CodeGen/CGDecl.cpp
===================================================================
--- clang/lib/CodeGen/CGDecl.cpp
+++ clang/lib/CodeGen/CGDecl.cpp
@@ -1517,9 +1517,12 @@
// is rare.
if (!Bypasses.IsBypassed(&D) &&
!(!getLangOpts().CPlusPlus && hasLabelBeenSeenInCurrentScope())) {
- uint64_t size = CGM.getDataLayout().getTypeAllocSize(allocaTy);
+ llvm::TypeSize size =
+ CGM.getDataLayout().getTypeAllocSize(allocaTy);
emission.SizeForLifetimeMarkers =
- EmitLifetimeStart(size, AllocaAddr.getPointer());
+ size.isScalable() ? EmitLifetimeStart(-1, AllocaAddr.getPointer())
+ : EmitLifetimeStart(size.getFixedSize(),
+ AllocaAddr.getPointer());
}
} else {
assert(!emission.useLifetimeMarkers());
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
