Fix typo "x84_64"

[CaseyCarter]

Apparently great minds think alike: I noticed these while correcting the same typo in MSVC's sources.

[llvmbot]

@llvm/pr-subscribers-clang-driver
@llvm/pr-subscribers-clang

@llvm/pr-subscribers-backend-x86

Changes

Apparently great minds think alike: I noticed these while correcting the same typo in MSVC's sources.

---

Full diff: https://github.com/llvm/llvm-project/pull/68419.diff

2 Files Affected:

• (modified) clang/test/Driver/cuda-detect.cu (+1-1)
• (modified) llvm/lib/Target/X86/X86RegisterInfo.td (+1-1)

diff --git a/clang/test/Driver/cuda-detect.cu b/clang/test/Driver/cuda-detect.cu
index ad6b90c90c7b756..077d555a3128f27 100644
--- a/clang/test/Driver/cuda-detect.cu
+++ b/clang/test/Driver/cuda-detect.cu
@@ -29,7 +29,7 @@
 // RUN:   --sysroot=%S/Inputs/CUDA-nolibdevice --cuda-path-ignore-env 2>&1 | FileCheck %s -check-prefix NOCUDA
 // RUN: %clang -v --target=x86_64-unknown-linux \
 // RUN:   --sysroot=%S/Inputs/CUDA-nolibdevice --cuda-path-ignore-env 2>&1 | FileCheck %s -check-prefix NOCUDA
-// RUN: %clang -v --target=x84_64-apple-macosx \
+// RUN: %clang -v --target=x86_64-apple-macosx \
 // RUN:   --sysroot=%S/Inputs/CUDA-nolibdevice --cuda-path-ignore-env 2>&1 | FileCheck %s -check-prefix NOCUDA
 
 // ... unless the user doesn't need libdevice
diff --git a/llvm/lib/Target/X86/X86RegisterInfo.td b/llvm/lib/Target/X86/X86RegisterInfo.td
index 1e6477e658b9d10..81b7597cc8ea5c0 100644
--- a/llvm/lib/Target/X86/X86RegisterInfo.td
+++ b/llvm/lib/Target/X86/X86RegisterInfo.td
@@ -508,7 +508,7 @@ def GR64_NOREX_NOSP : RegisterClass<"X86", [i64], 64,
                                     (and GR64_NOREX, GR64_NOSP)>;
 
 // Register classes used for ABIs that use 32-bit address accesses,
-// while using the whole x84_64 ISA.
+// while using the whole x86_64 ISA.
 
 // In such cases, it is fine to use RIP as we are sure the 32 high
 // bits are not set. We do not need variants for NOSP as RIP is not

[phoebewang]

Good catch, thanks!

[CaseyCarter]

The test failure cannot possibly be related to this nearly non-functional change. Shall I merge anyway, or rerun (can I rerun without pushing to the branch)?

******************** TEST 'BOLT :: RISCV/reloc-tls.s' FAILED ********************
  | Exit Code: 1
  |  
  | Command Output (stderr):
  | --
  | RUN: at line 1: /var/lib/buildkite-agent/builds/linux-56-7f758798dd-khkmx-1/llvm-project/github-pull-requests/build/bin/llvm-mc -triple riscv64 -filetype obj -o /var/lib/buildkite-agent/builds/linux-56-7f758798dd-khkmx-1/llvm-project/github-pull-requests/build/tools/bolt/test/RISCV/Output/reloc-tls.s.tmp.o /var/lib/buildkite-agent/builds/linux-56-7f758798dd-khkmx-1/llvm-project/github-pull-requests/bolt/test/RISCV/reloc-tls.s
  | + /var/lib/buildkite-agent/builds/linux-56-7f758798dd-khkmx-1/llvm-project/github-pull-requests/build/bin/llvm-mc -triple riscv64 -filetype obj -o /var/lib/buildkite-agent/builds/linux-56-7f758798dd-khkmx-1/llvm-project/github-pull-requests/build/tools/bolt/test/RISCV/Output/reloc-tls.s.tmp.o /var/lib/buildkite-agent/builds/linux-56-7f758798dd-khkmx-1/llvm-project/github-pull-requests/bolt/test/RISCV/reloc-tls.s
  | RUN: at line 2: /var/lib/buildkite-agent/builds/linux-56-7f758798dd-khkmx-1/llvm-project/github-pull-requests/build/bin/ld.lld --emit-relocs -o /var/lib/buildkite-agent/builds/linux-56-7f758798dd-khkmx-1/llvm-project/github-pull-requests/build/tools/bolt/test/RISCV/Output/reloc-tls.s.tmp /var/lib/buildkite-agent/builds/linux-56-7f758798dd-khkmx-1/llvm-project/github-pull-requests/build/tools/bolt/test/RISCV/Output/reloc-tls.s.tmp.o
  | + /var/lib/buildkite-agent/builds/linux-56-7f758798dd-khkmx-1/llvm-project/github-pull-requests/build/bin/ld.lld --emit-relocs -o /var/lib/buildkite-agent/builds/linux-56-7f758798dd-khkmx-1/llvm-project/github-pull-requests/build/tools/bolt/test/RISCV/Output/reloc-tls.s.tmp /var/lib/buildkite-agent/builds/linux-56-7f758798dd-khkmx-1/llvm-project/github-pull-requests/build/tools/bolt/test/RISCV/Output/reloc-tls.s.tmp.o
  | RUN: at line 3: /var/lib/buildkite-agent/builds/linux-56-7f758798dd-khkmx-1/llvm-project/github-pull-requests/build/bin/llvm-bolt --print-cfg --print-only=tls_le,tls_ie -o /dev/null /var/lib/buildkite-agent/builds/linux-56-7f758798dd-khkmx-1/llvm-project/github-pull-requests/build/tools/bolt/test/RISCV/Output/reloc-tls.s.tmp     \| /var/lib/buildkite-agent/builds/linux-56-7f758798dd-khkmx-1/llvm-project/github-pull-requests/build/bin/FileCheck /var/lib/buildkite-agent/builds/linux-56-7f758798dd-khkmx-1/llvm-project/github-pull-requests/bolt/test/RISCV/reloc-tls.s
  | + /var/lib/buildkite-agent/builds/linux-56-7f758798dd-khkmx-1/llvm-project/github-pull-requests/build/bin/FileCheck /var/lib/buildkite-agent/builds/linux-56-7f758798dd-khkmx-1/llvm-project/github-pull-requests/bolt/test/RISCV/reloc-tls.s
  | + /var/lib/buildkite-agent/builds/linux-56-7f758798dd-khkmx-1/llvm-project/github-pull-requests/build/bin/llvm-bolt --print-cfg --print-only=tls_le,tls_ie -o /dev/null /var/lib/buildkite-agent/builds/linux-56-7f758798dd-khkmx-1/llvm-project/github-pull-requests/build/tools/bolt/test/RISCV/Output/reloc-tls.s.tmp
  | /var/lib/buildkite-agent/builds/linux-56-7f758798dd-khkmx-1/llvm-project/github-pull-requests/bolt/test/RISCV/reloc-tls.s:14:11: error: CHECK: expected string not found in input
  | // CHECK: auipc a0, %pcrel_hi(__BOLT_got_zero+{{[0-9]+}})
  | ^
  | <stdin>:63:70: note: scanning from here
  | 00000004: auipc a0, %pcrel_hi(__BOLT_got_zero+74232) # Label: .Ltmp0
  | ^
  | <stdin>:64:9: note: possible intended match here
  | 00000008: ld a0, %pcrel_lo(.Ltmp0)(a0)
  | ^
  |  
  | Input file: <stdin>
  | Check file: /var/lib/buildkite-agent/builds/linux-56-7f758798dd-khkmx-1/llvm-project/github-pull-requests/bolt/test/RISCV/reloc-tls.s
  |  
  | -dump-input=help explains the following input dump.
  |  
  | Input was:
  | <<<<<<
  | .
  | .
  | .
  | 58: }
  | 59: .LBB01 (4 instructions, align : 1)
  | 60:  Entry Point
  | 61:  CFI State : 0
  | 62:  00000000: addi zero, zero, 0 # Size: 4 # NOP: 1
  | 63:  00000004: auipc a0, %pcrel_hi(__BOLT_got_zero+74232) # Label: .Ltmp0
  | check:14'0                                                                          X error: no match found
  | 64:  00000008: ld a0, %pcrel_lo(.Ltmp0)(a0)
  | check:14'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  | check:14'1             ?                                possible intended match
  | 65:  0000000c: jalr zero, 0(ra)
  | check:14'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  | 66:  CFI State: 0
  | check:14'0     ~~~~~~~~~~~~~~
  | 67:
  | check:14'0     ~
  | 68: DWARF CFI Instructions:
  | check:14'0     ~~~~~~~~~~~~~~~~~~~~~~~~
  | 69:  <empty>
  | check:14'0     ~~~~~~~~~
  | .
  | .
  | .
  | >>>>>>

[phoebewang]

I think it's ok to merge.