[PATCH] D131230: [RISCV] Allow mismatched SmallDataLimit and use Min for conflicting values
Aditya Kumar via Phabricator via cfe-commits
cfe-commits at lists.llvm.org
Tue Feb 7 14:01:09 PST 2023
hiraditya updated this revision to Diff 495641.
hiraditya added a comment.
Updated the failing testcase.
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D131230/new/
https://reviews.llvm.org/D131230
Files:
clang/lib/CodeGen/CodeGenModule.cpp
clang/test/CodeGen/RISCV/riscv-sdata-module-flag.c
clang/test/CodeGen/RISCV/rvv-intrinsics-handcrafted/vlenb.c
Index: clang/test/CodeGen/RISCV/rvv-intrinsics-handcrafted/vlenb.c
===================================================================
--- clang/test/CodeGen/RISCV/rvv-intrinsics-handcrafted/vlenb.c
+++ clang/test/CodeGen/RISCV/rvv-intrinsics-handcrafted/vlenb.c
@@ -29,11 +29,11 @@
//.
// RV32: !0 = !{i32 1, !"wchar_size", i32 4}
// RV32: !1 = !{i32 1, !"target-abi", !"ilp32d"}
-// RV32: !2 = !{i32 1, !"SmallDataLimit", i32 0}
+// RV32: !2 = !{i32 8, !"SmallDataLimit", i32 0}
// RV32: !3 = !{!"vlenb"}
//.
// RV64: !0 = !{i32 1, !"wchar_size", i32 4}
// RV64: !1 = !{i32 1, !"target-abi", !"lp64d"}
-// RV64: !2 = !{i32 1, !"SmallDataLimit", i32 0}
+// RV64: !2 = !{i32 8, !"SmallDataLimit", i32 0}
// RV64: !3 = !{!"vlenb"}
//.
Index: clang/test/CodeGen/RISCV/riscv-sdata-module-flag.c
===================================================================
--- clang/test/CodeGen/RISCV/riscv-sdata-module-flag.c
+++ clang/test/CodeGen/RISCV/riscv-sdata-module-flag.c
@@ -28,20 +28,20 @@
void test(void) {}
-// RV32-DEFAULT: !{i32 1, !"SmallDataLimit", i32 8}
-// RV32-G4: !{i32 1, !"SmallDataLimit", i32 4}
-// RV32-S0: !{i32 1, !"SmallDataLimit", i32 0}
-// RV32-S2G4: !{i32 1, !"SmallDataLimit", i32 4}
-// RV32-T16: !{i32 1, !"SmallDataLimit", i32 16}
-// RV32-PIC: !{i32 1, !"SmallDataLimit", i32 0}
+// RV32-DEFAULT: !{i32 8, !"SmallDataLimit", i32 8}
+// RV32-G4: !{i32 8, !"SmallDataLimit", i32 4}
+// RV32-S0: !{i32 8, !"SmallDataLimit", i32 0}
+// RV32-S2G4: !{i32 8, !"SmallDataLimit", i32 4}
+// RV32-T16: !{i32 8, !"SmallDataLimit", i32 16}
+// RV32-PIC: !{i32 8, !"SmallDataLimit", i32 0}
-// RV64-DEFAULT: !{i32 1, !"SmallDataLimit", i32 8}
-// RV64-G4: !{i32 1, !"SmallDataLimit", i32 4}
-// RV64-S0: !{i32 1, !"SmallDataLimit", i32 0}
-// RV64-S2G4: !{i32 1, !"SmallDataLimit", i32 4}
-// RV64-T16: !{i32 1, !"SmallDataLimit", i32 16}
-// RV64-PIC: !{i32 1, !"SmallDataLimit", i32 0}
-// RV64-LARGE: !{i32 1, !"SmallDataLimit", i32 0}
+// RV64-DEFAULT: !{i32 8, !"SmallDataLimit", i32 8}
+// RV64-G4: !{i32 8, !"SmallDataLimit", i32 4}
+// RV64-S0: !{i32 8, !"SmallDataLimit", i32 0}
+// RV64-S2G4: !{i32 8, !"SmallDataLimit", i32 4}
+// RV64-T16: !{i32 8, !"SmallDataLimit", i32 16}
+// RV64-PIC: !{i32 8, !"SmallDataLimit", i32 0}
+// RV64-LARGE: !{i32 8, !"SmallDataLimit", i32 0}
// The value will be passed by module flag instead of target feature.
// RV32-S0-NOT: +small-data-limit=
Index: clang/lib/CodeGen/CodeGenModule.cpp
===================================================================
--- clang/lib/CodeGen/CodeGenModule.cpp
+++ clang/lib/CodeGen/CodeGenModule.cpp
@@ -980,7 +980,7 @@
void CodeGenModule::EmitBackendOptionsMetadata(
const CodeGenOptions CodeGenOpts) {
if (getTriple().isRISCV()) {
- getModule().addModuleFlag(llvm::Module::Error, "SmallDataLimit",
+ getModule().addModuleFlag(llvm::Module::Min, "SmallDataLimit",
CodeGenOpts.SmallDataLimit);
}
}
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D131230.495641.patch
Type: text/x-patch
Size: 3055 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20230207/5e9f4b0b/attachment.bin>
More information about the cfe-commits
mailing list