diff --git a/llvm/test/CodeGen/Mips/nanomips/disable_optimizers.ll b/llvm/test/CodeGen/Mips/nanomips/disable_optimizers.ll
index a03c68b3dda8dc..cb4267f404a55c 100644
--- a/llvm/test/CodeGen/Mips/nanomips/disable_optimizers.ll
+++ b/llvm/test/CodeGen/Mips/nanomips/disable_optimizers.ll
@@ -1,15 +1,17 @@
 ; RUN: llc -mtriple=nanomips -asm-show-inst -verify-machineinstrs < %s | FileCheck %s
-; RUIN: llc -mtriple=nanomips -asm-show-inst -verify-machineinstrs -disable-nm-save-restore < %s | FileCheck %s --check-prefix=CHECK-NO-SAVE-RESTORE
-; RUIN: llc -mtriple=nanomips -asm-show-inst -verify-machineinstrs -disable-nm-lwm-swm < %s | FileCheck %s --check-prefix=CHECK-NO-LWM-SWM
-; RUIN: llc -mtriple=nanomips -asm-show-inst -verify-machineinstrs -disable-nm-pcrel-opt < %s | FileCheck %s --check-prefix=CHECK-NO-PCREL
-; RUIN: llc -mtriple=nanomips -asm-show-inst -verify-machineinstrs -disable-nm-move-opt < %s | FileCheck %s --check-prefix=CHECK-NO-MOVE
+; RUN: llc -mtriple=nanomips -asm-show-inst -verify-machineinstrs -disable-nm-save-restore < %s | FileCheck %s --check-prefix=CHECK-NO-SAVE-RESTORE
+; RUN: llc -mtriple=nanomips -asm-show-inst -verify-machineinstrs -disable-nm-lwm-swm < %s | FileCheck %s --check-prefix=CHECK-NO-LWM-SWM
+; RUN: llc -mtriple=nanomips -asm-show-inst -verify-machineinstrs -disable-nm-pcrel-opt < %s | FileCheck %s --check-prefix=CHECK-NO-PCREL
+; RUN: llc -mtriple=nanomips -asm-show-inst -verify-machineinstrs -disable-nm-move-opt < %s | FileCheck %s --check-prefix=CHECK-NO-MOVE
 
 ; CHECK-LABEL: test4:
 ; CHECK-NO-SAVE-RESTORE-LABEL: test4:
 ; CHECK-NO-LWM-SWM-LABEL: test4:
 ; CHECK-NO-PCREL-LABEL: test4:
 
-define void @test4(i32 %n, ...) {
+attributes #0 = { optsize }
+
+define void @test4(i32 %n, ...) #0 {
 ; CHECK: swm $a1, 4($sp), 7
 ; CHECK-NO-SAVE-RESTORE: swm $a1, 4($sp), 7
 ; CHECK-NO-LWM-SWM-NOT: swm
@@ -26,7 +28,7 @@ define void @test4(i32 %n, ...) {
 ; CHECK-NO-LWM-SWM-LABEL: square:
 ; CHECK-NO-PCREL-LABEL: square:
 
-define void @square(%struct.bar* %ints) {
+define void @square(%struct.bar* %ints) #0 {
 
 ; CHECK: lwm $a1, 0($a0), 2
 ; CHECK-NO-SAVE-RESTORE: lwm $a1, 0($a0), 2
@@ -95,15 +97,13 @@ define i32 @test_pcrel() {
 
 declare i32 @bar(i32, i32)
 
+; CHECK-LABEL: movep:
 ; CHECK-NO-SAVE-RESTORE-LABEL: movep:
 ; CHECK-NO-LWM-SWM-LABEL: movep:
 ; CHECK-NO-PCREL-LABEL: movep:
 
-; CHECK-LABEL: movep:
-; CHECK-NO-PCREL-LABEL: movep:
-
 define void @movep(i32 %a, i32 %b, i32 %c, i32 %d) {
-; CHECK-NO-MOVE-NOT: movep
+; CHECK-NO-MOVE-NOT: movep{{.*,.*,.*,}}
 ; CHECK: movep $s1, $s0, $a0, $a1
 ; CHECK: movep $a0, $a1, $a2, $a3
   call i32 @bar(i32 %c, i32 %d)
diff --git a/llvm/test/CodeGen/Mips/nanomips/loadstoremultiple.ll b/llvm/test/CodeGen/Mips/nanomips/loadstoremultiple.ll
index 9e0b96f784110d..8282010266814c 100644
--- a/llvm/test/CodeGen/Mips/nanomips/loadstoremultiple.ll
+++ b/llvm/test/CodeGen/Mips/nanomips/loadstoremultiple.ll
@@ -1,6 +1,8 @@
 ; RUN: llc -mtriple=nanomips -asm-show-inst -verify-machineinstrs < %s | FileCheck %s
 
-define void @test4(i32 %n, ...) {
+attributes #0 = { optsize }
+
+define void @test4(i32 %n, ...) #0 {
 ; CHECK: swm $a1, 4($sp), 7
   call void asm sideeffect "", ""()
   ret void
@@ -8,7 +10,7 @@ define void @test4(i32 %n, ...) {
 
 %struct.bar = type { i32, i32, i32 }
 
-define void @square(%struct.bar* %ints) {
+define void @square(%struct.bar* %ints) #0 {
 ; CHECK: lwm $a1, 0($a0), 2
   %a = getelementptr inbounds %struct.bar, %struct.bar* %ints, i32 0, i32 0
   %1 = load i32, i32* %a, align 4