From 1a6d92e562fa76c0113275ef0bdc3c6077c5c5b6 Mon Sep 17 00:00:00 2001
From: Zoran Jovanovic <zoran.jovanovic@imgtec.com>
Date: Thu, 29 Oct 2015 14:40:19 +0000
Subject: [PATCH] [mips] wrong opcode for ll/sc instructions on mipsr6 when
 -integrated-as is used

Summary:
This commit resolves wrong opcodes for ll and sc instructions for r6 architecutres, which were generated in method MipsTargetLowering::emitAtomicBinary.

Author: Jelena.Losic

Reviewers: dsanders

Subscribers: dsanders, llvm-commits

Differential Revision: http://reviews.llvm.org/D13593


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@251629 91177308-0d34-0410-b5e6-96231b3b80d8
---
 lib/Target/Mips/MipsISelLowering.cpp | 15 ++++++++-----
 test/CodeGen/Mips/atomicSCr6.ll      | 32 ++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 5 deletions(-)
 create mode 100644 test/CodeGen/Mips/atomicSCr6.ll

diff --git a/lib/Target/Mips/MipsISelLowering.cpp b/lib/Target/Mips/MipsISelLowering.cpp
index 7e8bccddca5..b88af5a9a0e 100644
--- a/lib/Target/Mips/MipsISelLowering.cpp
+++ b/lib/Target/Mips/MipsISelLowering.cpp
@@ -1329,15 +1329,20 @@ MachineBasicBlock * MipsTargetLowering::emitAtomicCmpSwap(MachineInstr *MI,
   DebugLoc DL = MI->getDebugLoc();
   unsigned LL, SC, ZERO, BNE, BEQ;
 
-  if (Size == 4) {
-    LL = isMicroMips ? Mips::LL_MM : Mips::LL;
-    SC = isMicroMips ? Mips::SC_MM : Mips::SC;
+   if (Size == 4) {
+     if (isMicroMips) {
+       LL = Mips::LL_MM;
+       SC = Mips::SC_MM;
+     } else {
+       LL = Subtarget.hasMips32r6() ? Mips::LL_R6 : Mips::LL;
+       SC = Subtarget.hasMips32r6() ? Mips::SC_R6 : Mips::SC;
+     }
     ZERO = Mips::ZERO;
     BNE = Mips::BNE;
     BEQ = Mips::BEQ;
   } else {
-    LL = Mips::LLD;
-    SC = Mips::SCD;
+    LL = Subtarget.hasMips64r6() ? Mips::LLD_R6 : Mips::LLD;
+    SC = Subtarget.hasMips64r6() ? Mips::SCD_R6 : Mips::SCD;
     ZERO = Mips::ZERO_64;
     BNE = Mips::BNE64;
     BEQ = Mips::BEQ64;
diff --git a/test/CodeGen/Mips/atomicSCr6.ll b/test/CodeGen/Mips/atomicSCr6.ll
new file mode 100644
index 00000000000..142b8b027e0
--- /dev/null
+++ b/test/CodeGen/Mips/atomicSCr6.ll
@@ -0,0 +1,32 @@
+; RUN: llc -asm-show-inst  -march=mips64el -mcpu=mips64r6 < %s -filetype=asm -o - | FileCheck %s -check-prefix=CHK64 
+; RUN: llc -asm-show-inst  -march=mipsel -mcpu=mips32r6 < %s -filetype=asm -o -| FileCheck %s -check-prefix=CHK32
+
+define internal i32 @atomic_load_test1() #0 {
+entry:
+
+  %load_add = alloca i32*, align 8
+  %.atomicdst = alloca i32, align 4
+  %0 = load i32*, i32** %load_add, align 8
+  %1 = load atomic i32, i32* %0 acquire, align 4
+  store i32 %1, i32* %.atomicdst, align 4
+  %2 = load i32, i32* %.atomicdst, align 4
+  
+  ret i32 %2
+}
+
+define internal i64 @atomic_load_test2() #0 {
+entry:
+
+  %load_add = alloca i64*, align 16
+  %.atomicdst = alloca i64, align 8
+  %0 = load i64*, i64** %load_add, align 16
+  %1 = load atomic i64, i64* %0 acquire, align 8
+  store i64 %1, i64* %.atomicdst, align 8
+  %2 = load i64, i64* %.atomicdst, align 8
+  
+  ret i64 %2
+}
+;CHK32:  LL_R6
+;CHK32:  SC_R6
+;CHK64:  LLD_R6
+;CHK64:  SCD_R6
-- 
2.34.1