[RISCV] Reserve X18 by default for Android

[hiraditya]

Summary

Reserve X18 even when -fsanitize=shadow-call-stack is not enabled.

Based on: https://reviews.llvm.org/D143355

[phosek]

LGTM

[samitolvanen]

LGTM. Folding D145979 into this one might also make sense.

clang/test/Driver/riscv-fixed-x-register.c

343 ↗

(On Diff #504880)

This seems redundant. Isn't the LLVM codegen test sufficient here?

[asb]

clang/test/Driver/riscv-fixed-x-register.c

343 ↗

(On Diff #504880)

I think testing that the +reserve-x18 target feature is added by the frontend probably has some value.

I think it would better match the rest of this file to just do --check-prefix=CHECK-FIXED-X18 (I _think_ that works, but it is the end of the day so I may be missing something obvious...).

Please do try to remember to generate patches with full context (-U999999 or similar).

[asb]

LGTM.

[MaskRay]

clang/test/Driver/riscv-fixed-x-register.c

343 ↗

(On Diff #504880)

I prefer shared CHECK prefixes --check-prefix=CHECK-FIXED-X18 as well. We do that for many other tests.

343 ↗

(On Diff #504880)

/// Check that x18 is reserved on Android by default.

[hiraditya]

clang/test/Driver/riscv-fixed-x-register.c

343 ↗

(On Diff #504880)

@samitolvanen correct, this test isn't possible because llvm implicitly reserves the register so clang -cc1 never gets the "-target-feature" "+reserve-x18" parameter. I'll remove this test.

[hiraditya]

Folded D145979 here

clang/test/Driver/sanitizer-ld.c

 // RUN:   | FileCheck --check-prefix=CHECK-SHADOWCALLSTACK-ELF-RISCV32 %s
 // CHECK-SHADOWCALLSTACK-ELF-RISCV32: '-fsanitize=shadow-call-stack' only allowed with '-ffixed-x18'
 
 // RUN: %clang -fsanitize=shadow-call-stack -### %s 2>&1 \
 // RUN:     --target=riscv64-unknown-linux -fuse-ld=ld \
 // RUN:   | FileCheck --check-prefix=CHECK-SHADOWCALLSTACK-LINUX-RISCV64 %s
 // CHECK-SHADOWCALLSTACK-LINUX-RISCV64: '-fsanitize=shadow-call-stack' only allowed with '-ffixed-x18'
 
+// RUN: %clang -target riscv64-linux-android -fsanitize=shadow-call-stack %s -### 2>&1 \
+// RUN:   | FileCheck %s --check-prefix=CHECK-SHADOWCALLSTACK-ANDROID-RISCV64
+// CHECK-SHADOWCALLSTACK-ANDROID-RISCV64-NOT: error:
+
 // RUN: %clang -fsanitize=shadow-call-stack -### %s 2>&1 \
 // RUN:     --target=riscv64-unknown-fuchsia -fuse-ld=ld \
 // RUN:   | FileCheck --check-prefix=CHECK-SHADOWCALLSTACK-FUCHSIA-RISCV64 %s
 // CHECK-SHADOWCALLSTACK-FUCHSIA-RISCV64-NOT: error:
 
 // RUN: %clang -fsanitize=shadow-call-stack -### %s 2>&1 \
 // RUN:     --target=aarch64-unknown-linux -fuse-ld=ld -ffixed-x18 \
 // RUN:   | FileCheck --check-prefix=CHECK-SHADOWCALLSTACK-LINUX-AARCH64-X18 %s

llvm/lib/TargetParser/RISCVTargetParser.cpp

bool getCPUFeaturesExceptStdExt(CPUKind Kind,
   else
     Features.push_back("-64bit");
 
   return true;
 }
 
 bool isX18ReservedByDefault(const Triple &TT) {
   // X18 is reserved for the ShadowCallStack ABI (even when not enabled).
-  return TT.isOSFuchsia();
+  return TT.isOSFuchsia() || TT.isAndroid();
 }
 
 } // namespace RISCV
 } // namespace llvm

llvm/test/CodeGen/RISCV/reserved-regs.ll

 ; RUN: llc -mtriple=riscv32 -mattr=+reserve-x29 -verify-machineinstrs < %s | FileCheck %s -check-prefix=X29
 ; RUN: llc -mtriple=riscv64 -mattr=+reserve-x29 -verify-machineinstrs < %s | FileCheck %s -check-prefix=X29
 ; RUN: llc -mtriple=riscv32 -mattr=+reserve-x30 -verify-machineinstrs < %s | FileCheck %s -check-prefix=X30
 ; RUN: llc -mtriple=riscv64 -mattr=+reserve-x30 -verify-machineinstrs < %s | FileCheck %s -check-prefix=X30
 ; RUN: llc -mtriple=riscv32 -mattr=+reserve-x31 -verify-machineinstrs < %s | FileCheck %s -check-prefix=X31
 ; RUN: llc -mtriple=riscv64 -mattr=+reserve-x31 -verify-machineinstrs < %s | FileCheck %s -check-prefix=X31
 
 ; RUN: llc -mtriple=riscv64-fuchsia -verify-machineinstrs < %s | FileCheck %s -check-prefix=X18
+; RUN: llc -mtriple=riscv64-linux-android -verify-machineinstrs < %s | FileCheck %s -check-prefix=X18
 
 ; This program is free to use all registers, but needs a stack pointer for
 ; spill values, so do not test for reserving the stack pointer.
 
 ; Used to exhaust all registers
 @var = global [32 x i64] zeroinitializer
 
 define void @foo() {