This revision was landed with ongoing or failed builds. This revision was automatically updated to reflect the committed changes. Closed by commit rGf7623f4f692d: Enable zba and zbs for RISCV64 Android (authored by AdityaK <1894981+hiradi...@users.noreply.github.com>).
Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D155339/new/ https://reviews.llvm.org/D155339 Files: clang/lib/Driver/ToolChains/Arch/RISCV.cpp clang/test/Driver/riscv-features.c Index: clang/test/Driver/riscv-features.c =================================================================== --- clang/test/Driver/riscv-features.c +++ clang/test/Driver/riscv-features.c @@ -10,7 +10,9 @@ // RUN: %clang --target=riscv32-unknown-elf -### %s -mrelax 2>&1 | FileCheck %s -check-prefix=RELAX // RUN: %clang --target=riscv32-unknown-elf -### %s -mno-relax 2>&1 | FileCheck %s -check-prefix=NO-RELAX +// ANDROID: "-target-feature" "+zba" // ANDROID: "-target-feature" "+zbb" +// ANDROID: "-target-feature" "+zbs" // RELAX: "-target-feature" "+relax" // NO-RELAX: "-target-feature" "-relax" // DEFAULT: "-target-feature" "+relax" Index: clang/lib/Driver/ToolChains/Arch/RISCV.cpp =================================================================== --- clang/lib/Driver/ToolChains/Arch/RISCV.cpp +++ clang/lib/Driver/ToolChains/Arch/RISCV.cpp @@ -294,7 +294,7 @@ return "rv32imafdc"; else if (MABI.starts_with_insensitive("lp64")) { if (Triple.isAndroid()) - return "rv64imafdc_zbb"; + return "rv64imafdc_zba_zbb_zbs"; return "rv64imafdc"; } @@ -314,7 +314,7 @@ if (Triple.getOS() == llvm::Triple::UnknownOS) return "rv64imac"; else if (Triple.isAndroid()) - return "rv64imafdc_zbb"; + return "rv64imafdc_zba_zbb_zbs"; else return "rv64imafdc"; }
Index: clang/test/Driver/riscv-features.c =================================================================== --- clang/test/Driver/riscv-features.c +++ clang/test/Driver/riscv-features.c @@ -10,7 +10,9 @@ // RUN: %clang --target=riscv32-unknown-elf -### %s -mrelax 2>&1 | FileCheck %s -check-prefix=RELAX // RUN: %clang --target=riscv32-unknown-elf -### %s -mno-relax 2>&1 | FileCheck %s -check-prefix=NO-RELAX +// ANDROID: "-target-feature" "+zba" // ANDROID: "-target-feature" "+zbb" +// ANDROID: "-target-feature" "+zbs" // RELAX: "-target-feature" "+relax" // NO-RELAX: "-target-feature" "-relax" // DEFAULT: "-target-feature" "+relax" Index: clang/lib/Driver/ToolChains/Arch/RISCV.cpp =================================================================== --- clang/lib/Driver/ToolChains/Arch/RISCV.cpp +++ clang/lib/Driver/ToolChains/Arch/RISCV.cpp @@ -294,7 +294,7 @@ return "rv32imafdc"; else if (MABI.starts_with_insensitive("lp64")) { if (Triple.isAndroid()) - return "rv64imafdc_zbb"; + return "rv64imafdc_zba_zbb_zbs"; return "rv64imafdc"; } @@ -314,7 +314,7 @@ if (Triple.getOS() == llvm::Triple::UnknownOS) return "rv64imac"; else if (Triple.isAndroid()) - return "rv64imafdc_zbb"; + return "rv64imafdc_zba_zbb_zbs"; else return "rv64imafdc"; }
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits