From 77b00098f2908cbef5a92135dd9b80a6db514c7c Mon Sep 17 00:00:00 2001 From: Paul Robinson Date: Thu, 16 Jun 2022 11:02:45 -0700 Subject: [PATCH] [PS5] Use same debug trap instruction as PS4 --- llvm/lib/Target/X86/X86InstrInfo.td | 4 ++-- llvm/lib/Target/X86/X86InstrSystem.td | 4 ++-- llvm/lib/Target/X86/X86Subtarget.h | 2 +- llvm/test/CodeGen/X86/trap.ll | 1 + 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/llvm/lib/Target/X86/X86InstrInfo.td b/llvm/lib/Target/X86/X86InstrInfo.td index bc0dccf..fab6ccd 100644 --- a/llvm/lib/Target/X86/X86InstrInfo.td +++ b/llvm/lib/Target/X86/X86InstrInfo.td @@ -1013,8 +1013,8 @@ def NotWin64WithoutFP : Predicate<"!Subtarget->isTargetWin64() ||" "Subtarget->getFrameLowering()->hasFP(*MF)"> { let RecomputePerFunction = 1; } -def IsPS4 : Predicate<"Subtarget->isTargetPS4()">; -def NotPS4 : Predicate<"!Subtarget->isTargetPS4()">; +def IsPS : Predicate<"Subtarget->isTargetPS()">; +def NotPS : Predicate<"!Subtarget->isTargetPS()">; def IsNaCl : Predicate<"Subtarget->isTargetNaCl()">; def NotNaCl : Predicate<"!Subtarget->isTargetNaCl()">; def SmallCode : Predicate<"TM.getCodeModel() == CodeModel::Small">; diff --git a/llvm/lib/Target/X86/X86InstrSystem.td b/llvm/lib/Target/X86/X86InstrSystem.td index 5ec0e9b..3a653a5 100644 --- a/llvm/lib/Target/X86/X86InstrSystem.td +++ b/llvm/lib/Target/X86/X86InstrSystem.td @@ -71,9 +71,9 @@ def SYSEXIT64 :RI<0x35, RawFrm, (outs), (ins), "sysexitq", []>, TB, } // SchedRW def : Pat<(debugtrap), - (INT3)>, Requires<[NotPS4]>; + (INT3)>, Requires<[NotPS]>; def : Pat<(debugtrap), - (INT (i8 0x41))>, Requires<[IsPS4]>; + (INT (i8 0x41))>, Requires<[IsPS]>; //===----------------------------------------------------------------------===// // Input/Output Instructions. diff --git a/llvm/lib/Target/X86/X86Subtarget.h b/llvm/lib/Target/X86/X86Subtarget.h index e66acfc..09a8b1f 100644 --- a/llvm/lib/Target/X86/X86Subtarget.h +++ b/llvm/lib/Target/X86/X86Subtarget.h @@ -271,7 +271,7 @@ public: bool isTargetFreeBSD() const { return TargetTriple.isOSFreeBSD(); } bool isTargetDragonFly() const { return TargetTriple.isOSDragonFly(); } bool isTargetSolaris() const { return TargetTriple.isOSSolaris(); } - bool isTargetPS4() const { return TargetTriple.isPS4(); } + bool isTargetPS() const { return TargetTriple.isPS(); } bool isTargetELF() const { return TargetTriple.isOSBinFormatELF(); } bool isTargetCOFF() const { return TargetTriple.isOSBinFormatCOFF(); } diff --git a/llvm/test/CodeGen/X86/trap.ll b/llvm/test/CodeGen/X86/trap.ll index 452be48..1b1837a 100644 --- a/llvm/test/CodeGen/X86/trap.ll +++ b/llvm/test/CodeGen/X86/trap.ll @@ -1,6 +1,7 @@ ; RUN: llc < %s -mtriple=i686-apple-darwin8 -mcpu=yonah | FileCheck %s -check-prefix=DARWIN ; RUN: llc < %s -mtriple=i686-unknown-linux -mcpu=yonah | FileCheck %s -check-prefix=LINUX ; RUN: llc < %s -mtriple=x86_64-scei-ps4 | FileCheck %s -check-prefix=PS4 +; RUN: llc < %s -mtriple=x86_64-sie-ps5 | FileCheck %s -check-prefix=PS4 ; RUN: llc < %s -mtriple=x86_64-windows-msvc | FileCheck %s -check-prefix=WIN64 ; DARWIN-LABEL: test0: -- 2.7.4