diff --git a/llvm/lib/Target/Mips/AsmParser/MipsAsmParser.cpp b/llvm/lib/Target/Mips/AsmParser/MipsAsmParser.cpp
index 8a8cf562abe7..9d5c179a0fd9 100644
--- a/llvm/lib/Target/Mips/AsmParser/MipsAsmParser.cpp
+++ b/llvm/lib/Target/Mips/AsmParser/MipsAsmParser.cpp
@@ -5107,7 +5107,7 @@ int MipsAsmParser::matchCPURegisterName(StringRef Name) {
 
   CC = StringSwitch<unsigned>(Name)
            .Case("zero", 0)
-           .Case("at", 1)
+           .Cases("at", "AT", 1)
            .Case("a0", 4)
            .Case("a1", 5)
            .Case("a2", 6)
diff --git a/llvm/test/MC/Mips/mips-register-names-o32.s b/llvm/test/MC/Mips/mips-register-names-o32.s
index c1e30240389a..f59a16346765 100644
--- a/llvm/test/MC/Mips/mips-register-names-o32.s
+++ b/llvm/test/MC/Mips/mips-register-names-o32.s
@@ -7,6 +7,7 @@
 .set noat
 addiu	$zero, $zero, 0 # CHECK: encoding: [0x24,0x00,0x00,0x00]
 addiu	$at, $zero, 0   # CHECK: encoding: [0x24,0x01,0x00,0x00]
+addiu	$AT, $zero, 0   # CHECK: encoding: [0x24,0x01,0x00,0x00]
 addiu	$v0, $zero, 0   # CHECK: encoding: [0x24,0x02,0x00,0x00]
 addiu	$v1, $zero, 0   # CHECK: encoding: [0x24,0x03,0x00,0x00]
 addiu	$a0, $zero, 0   # CHECK: encoding: [0x24,0x04,0x00,0x00]
diff --git a/llvm/test/MC/Mips/mips64-register-names-n32-n64.s b/llvm/test/MC/Mips/mips64-register-names-n32-n64.s
index fb2c426c625c..c1eb36a8fc76 100644
--- a/llvm/test/MC/Mips/mips64-register-names-n32-n64.s
+++ b/llvm/test/MC/Mips/mips64-register-names-n32-n64.s
@@ -13,6 +13,7 @@
 .set noat
 daddiu	$zero, $zero, 0     # CHECK: encoding: [0x64,0x00,0x00,0x00]
 daddiu	$at, $zero, 0       # CHECK: encoding: [0x64,0x01,0x00,0x00]
+daddiu	$AT, $zero, 0       # CHECK: encoding: [0x64,0x01,0x00,0x00]
 daddiu	$v0, $zero, 0       # CHECK: encoding: [0x64,0x02,0x00,0x00]
 daddiu	$v1, $zero, 0       # CHECK: encoding: [0x64,0x03,0x00,0x00]
 daddiu	$a0, $zero, 0       # CHECK: encoding: [0x64,0x04,0x00,0x00]
diff --git a/llvm/test/MC/Mips/mips64-register-names-o32.s b/llvm/test/MC/Mips/mips64-register-names-o32.s
index 1735a03b312c..18dd01da8709 100644
--- a/llvm/test/MC/Mips/mips64-register-names-o32.s
+++ b/llvm/test/MC/Mips/mips64-register-names-o32.s
@@ -8,6 +8,7 @@
 .set noat
 addiu	$zero, $zero, 0 # CHECK: encoding: [0x24,0x00,0x00,0x00]
 addiu	$at, $zero, 0   # CHECK: encoding: [0x24,0x01,0x00,0x00]
+addiu	$AT, $zero, 0   # CHECK: encoding: [0x24,0x01,0x00,0x00]
 addiu	$v0, $zero, 0   # CHECK: encoding: [0x24,0x02,0x00,0x00]
 addiu	$v1, $zero, 0   # CHECK: encoding: [0x24,0x03,0x00,0x00]
 addiu	$a0, $zero, 0   # CHECK: encoding: [0x24,0x04,0x00,0x00]