Author: wangpc Date: 2023-02-07T11:00:25+08:00 New Revision: 3df16e6f6e4d933f3839003e29b8a4b70e4c7ec8
URL: https://github.com/llvm/llvm-project/commit/3df16e6f6e4d933f3839003e29b8a4b70e4c7ec8 DIFF: https://github.com/llvm/llvm-project/commit/3df16e6f6e4d933f3839003e29b8a4b70e4c7ec8.diff LOG: Revert "[RISCV] Allow mismatched SmallDataLimit and use Min for conflicting values" This reverts commit 28bd84f55fc087d4aefd3fe5360f8648d1d50980 because `CodeGen/RISCV/rvv-intrinsics-handcrafted/vlenb.c` hasn't been updated. Added: Modified: clang/lib/CodeGen/CodeGenModule.cpp clang/test/CodeGen/RISCV/riscv-sdata-module-flag.c Removed: ################################################################################ diff --git a/clang/lib/CodeGen/CodeGenModule.cpp b/clang/lib/CodeGen/CodeGenModule.cpp index e9d088da01f1..24b63372500b 100644 --- a/clang/lib/CodeGen/CodeGenModule.cpp +++ b/clang/lib/CodeGen/CodeGenModule.cpp @@ -980,7 +980,7 @@ void CodeGenModule::EmitOpenCLMetadata() { void CodeGenModule::EmitBackendOptionsMetadata( const CodeGenOptions CodeGenOpts) { if (getTriple().isRISCV()) { - getModule().addModuleFlag(llvm::Module::Min, "SmallDataLimit", + getModule().addModuleFlag(llvm::Module::Error, "SmallDataLimit", CodeGenOpts.SmallDataLimit); } } diff --git a/clang/test/CodeGen/RISCV/riscv-sdata-module-flag.c b/clang/test/CodeGen/RISCV/riscv-sdata-module-flag.c index aa407c17ea05..89c9cc8cb0d0 100644 --- a/clang/test/CodeGen/RISCV/riscv-sdata-module-flag.c +++ b/clang/test/CodeGen/RISCV/riscv-sdata-module-flag.c @@ -28,20 +28,20 @@ void test(void) {} -// 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} +// 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} -// 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} +// 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} // The value will be passed by module flag instead of target feature. // RV32-S0-NOT: +small-data-limit= _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
