diff options
10 files changed, 21 insertions, 21 deletions
diff --git a/llvm/lib/Target/X86/X86ScheduleBtVer2.td b/llvm/lib/Target/X86/X86ScheduleBtVer2.td index 2d468299b8b..b01343f0c5b 100644 --- a/llvm/lib/Target/X86/X86ScheduleBtVer2.td +++ b/llvm/lib/Target/X86/X86ScheduleBtVer2.td @@ -41,17 +41,17 @@ def JFPU1 : ProcResource<1>; // Vector/FPU Pipe1: VALU1/STC/FPM // The Integer PRF for Jaguar is 64 entries, and it holds the architectural and // speculative version of the 64-bit integer registers. // Reference: www.realworldtech.com/jaguar/4/ -def IntegerPRF : RegisterFile<64, [GR8, GR16, GR32, GR64, CCR]>; +def JIntegerPRF : RegisterFile<64, [GR8, GR16, GR32, GR64, CCR]>; // The Jaguar FP Retire Queue renames SIMD and FP uOps onto a pool of 72 SSE // registers. Operations on 256-bit data types are cracked into two COPs. // Reference: www.realworldtech.com/jaguar/4/ -def FpuPRF: RegisterFile<72, [VR64, VR128, VR256], [1, 1, 2]>; +def JFpuPRF: RegisterFile<72, [VR64, VR128, VR256], [1, 1, 2]>; // The retire control unit (RCU) can track up to 64 macro-ops in-flight. It can // retire up to two macro-ops per cycle. // Reference: "Software Optimization Guide for AMD Family 16h Processors" -def RCU : RetireControlUnit<64, 2>; +def JRCU : RetireControlUnit<64, 2>; // Integer Pipe Scheduler def JALU01 : ProcResGroup<[JALU0, JALU1]> { diff --git a/llvm/test/tools/llvm-mca/X86/BtVer2/register-files-1.s b/llvm/test/tools/llvm-mca/X86/BtVer2/register-files-1.s index 5eb71563e30..fed5fd0e477 100644 --- a/llvm/test/tools/llvm-mca/X86/BtVer2/register-files-1.s +++ b/llvm/test/tools/llvm-mca/X86/BtVer2/register-files-1.s @@ -27,12 +27,12 @@ vmulps %xmm0, %xmm0, %xmm0 # CHECK-NEXT: Total number of mappings created: 10 # CHECK-NEXT: Max number of mappings used: 10 -# CHECK: * Register File #1 -- FpuPRF: +# CHECK: * Register File #1 -- JFpuPRF: # CHECK-NEXT: Number of physical registers: 72 # CHECK-NEXT: Total number of mappings created: 10 # CHECK-NEXT: Max number of mappings used: 10 -# CHECK: * Register File #2 -- IntegerPRF: +# CHECK: * Register File #2 -- JIntegerPRF: # CHECK-NEXT: Number of physical registers: 64 # CHECK-NEXT: Total number of mappings created: 0 # CHECK-NEXT: Max number of mappings used: 0 diff --git a/llvm/test/tools/llvm-mca/X86/BtVer2/register-files-2.s b/llvm/test/tools/llvm-mca/X86/BtVer2/register-files-2.s index 885a6036347..50c21dc32b9 100644 --- a/llvm/test/tools/llvm-mca/X86/BtVer2/register-files-2.s +++ b/llvm/test/tools/llvm-mca/X86/BtVer2/register-files-2.s @@ -28,12 +28,12 @@ vmulps %xmm0, %xmm0, %xmm0 # CHECK-NEXT: Total number of mappings created: 10 # CHECK-NEXT: Max number of mappings used: 5 -# CHECK: * Register File #1 -- FpuPRF: +# CHECK: * Register File #1 -- JFpuPRF: # CHECK-NEXT: Number of physical registers: 72 # CHECK-NEXT: Total number of mappings created: 10 # CHECK-NEXT: Max number of mappings used: 5 -# CHECK: * Register File #2 -- IntegerPRF: +# CHECK: * Register File #2 -- JIntegerPRF: # CHECK-NEXT: Number of physical registers: 64 # CHECK-NEXT: Total number of mappings created: 0 # CHECK-NEXT: Max number of mappings used: 0 diff --git a/llvm/test/tools/llvm-mca/X86/BtVer2/register-files-3.s b/llvm/test/tools/llvm-mca/X86/BtVer2/register-files-3.s index 26764e6e88e..7ba27ecb5c5 100644 --- a/llvm/test/tools/llvm-mca/X86/BtVer2/register-files-3.s +++ b/llvm/test/tools/llvm-mca/X86/BtVer2/register-files-3.s @@ -37,12 +37,12 @@ idiv %eax # CHECK-NEXT: Total number of mappings created: 6 # CHECK-NEXT: Max number of mappings used: 3 -# CHECK: * Register File #1 -- FpuPRF: +# CHECK: * Register File #1 -- JFpuPRF: # CHECK-NEXT: Number of physical registers: 72 # CHECK-NEXT: Total number of mappings created: 0 # CHECK-NEXT: Max number of mappings used: 0 -# CHECK: * Register File #2 -- IntegerPRF: +# CHECK: * Register File #2 -- JIntegerPRF: # CHECK-NEXT: Number of physical registers: 64 # CHECK-NEXT: Total number of mappings created: 6 # CHECK-NEXT: Max number of mappings used: 3 diff --git a/llvm/test/tools/llvm-mca/X86/BtVer2/register-files-4.s b/llvm/test/tools/llvm-mca/X86/BtVer2/register-files-4.s index 922c4428762..122e24392c8 100644 --- a/llvm/test/tools/llvm-mca/X86/BtVer2/register-files-4.s +++ b/llvm/test/tools/llvm-mca/X86/BtVer2/register-files-4.s @@ -37,12 +37,12 @@ idiv %eax # CHECK-NEXT: Total number of mappings created: 66 # CHECK-NEXT: Max number of mappings used: 63 -# CHECK: * Register File #1 -- FpuPRF: +# CHECK: * Register File #1 -- JFpuPRF: # CHECK-NEXT: Number of physical registers: 72 # CHECK-NEXT: Total number of mappings created: 0 # CHECK-NEXT: Max number of mappings used: 0 -# CHECK: * Register File #2 -- IntegerPRF: +# CHECK: * Register File #2 -- JIntegerPRF: # CHECK-NEXT: Number of physical registers: 64 # CHECK-NEXT: Total number of mappings created: 66 # CHECK-NEXT: Max number of mappings used: 63 diff --git a/llvm/test/tools/llvm-mca/X86/BtVer2/register-files-5.s b/llvm/test/tools/llvm-mca/X86/BtVer2/register-files-5.s index a93a31bbada..fc14e46677d 100644 --- a/llvm/test/tools/llvm-mca/X86/BtVer2/register-files-5.s +++ b/llvm/test/tools/llvm-mca/X86/BtVer2/register-files-5.s @@ -58,12 +58,12 @@ # CHECK-NEXT: Total number of mappings created: 66 # CHECK-NEXT: Max number of mappings used: 64 -# CHECK: * Register File #1 -- FpuPRF: +# CHECK: * Register File #1 -- JFpuPRF: # CHECK-NEXT: Number of physical registers: 72 # CHECK-NEXT: Total number of mappings created: 66 # CHECK-NEXT: Max number of mappings used: 64 -# CHECK: * Register File #2 -- IntegerPRF: +# CHECK: * Register File #2 -- JIntegerPRF: # CHECK-NEXT: Number of physical registers: 64 # CHECK-NEXT: Total number of mappings created: 0 # CHECK-NEXT: Max number of mappings used: 0 diff --git a/llvm/test/tools/llvm-mca/X86/option-all-stats-1.s b/llvm/test/tools/llvm-mca/X86/option-all-stats-1.s index bae6fb19c51..b0532e13f7b 100644 --- a/llvm/test/tools/llvm-mca/X86/option-all-stats-1.s +++ b/llvm/test/tools/llvm-mca/X86/option-all-stats-1.s @@ -56,12 +56,12 @@ add %eax, %eax # FULLREPORT-NEXT: Total number of mappings created: 200 # FULLREPORT-NEXT: Max number of mappings used: 44 -# FULLREPORT: * Register File #1 -- FpuPRF: +# FULLREPORT: * Register File #1 -- JFpuPRF: # FULLREPORT-NEXT: Number of physical registers: 72 # FULLREPORT-NEXT: Total number of mappings created: 0 # FULLREPORT-NEXT: Max number of mappings used: 0 -# FULLREPORT: * Register File #2 -- IntegerPRF: +# FULLREPORT: * Register File #2 -- JIntegerPRF: # FULLREPORT-NEXT: Number of physical registers: 64 # FULLREPORT-NEXT: Total number of mappings created: 200 # FULLREPORT-NEXT: Max number of mappings used: 44 diff --git a/llvm/test/tools/llvm-mca/X86/option-all-stats-2.s b/llvm/test/tools/llvm-mca/X86/option-all-stats-2.s index 1266d713d8c..89e2c1485f8 100644 --- a/llvm/test/tools/llvm-mca/X86/option-all-stats-2.s +++ b/llvm/test/tools/llvm-mca/X86/option-all-stats-2.s @@ -57,12 +57,12 @@ add %eax, %eax # FULL-NEXT: Total number of mappings created: 200 # FULL-NEXT: Max number of mappings used: 44 -# FULL: * Register File #1 -- FpuPRF: +# FULL: * Register File #1 -- JFpuPRF: # FULL-NEXT: Number of physical registers: 72 # FULL-NEXT: Total number of mappings created: 0 # FULL-NEXT: Max number of mappings used: 0 -# FULL: * Register File #2 -- IntegerPRF: +# FULL: * Register File #2 -- JIntegerPRF: # FULL-NEXT: Number of physical registers: 64 # FULL-NEXT: Total number of mappings created: 200 # FULL-NEXT: Max number of mappings used: 44 diff --git a/llvm/test/tools/llvm-mca/X86/option-all-views-1.s b/llvm/test/tools/llvm-mca/X86/option-all-views-1.s index 5baaca3a29e..c33867f1b63 100644 --- a/llvm/test/tools/llvm-mca/X86/option-all-views-1.s +++ b/llvm/test/tools/llvm-mca/X86/option-all-views-1.s @@ -56,12 +56,12 @@ add %eax, %eax # FULLREPORT-NEXT: Total number of mappings created: 200 # FULLREPORT-NEXT: Max number of mappings used: 44 -# FULLREPORT: * Register File #1 -- FpuPRF: +# FULLREPORT: * Register File #1 -- JFpuPRF: # FULLREPORT-NEXT: Number of physical registers: 72 # FULLREPORT-NEXT: Total number of mappings created: 0 # FULLREPORT-NEXT: Max number of mappings used: 0 -# FULLREPORT: * Register File #2 -- IntegerPRF: +# FULLREPORT: * Register File #2 -- JIntegerPRF: # FULLREPORT-NEXT: Number of physical registers: 64 # FULLREPORT-NEXT: Total number of mappings created: 200 # FULLREPORT-NEXT: Max number of mappings used: 44 diff --git a/llvm/test/tools/llvm-mca/X86/option-all-views-2.s b/llvm/test/tools/llvm-mca/X86/option-all-views-2.s index 6780a5a6c50..aa86e5117af 100644 --- a/llvm/test/tools/llvm-mca/X86/option-all-views-2.s +++ b/llvm/test/tools/llvm-mca/X86/option-all-views-2.s @@ -57,12 +57,12 @@ add %eax, %eax # ALL-NEXT: Total number of mappings created: 200 # ALL-NEXT: Max number of mappings used: 44 -# ALL: * Register File #1 -- FpuPRF: +# ALL: * Register File #1 -- JFpuPRF: # ALL-NEXT: Number of physical registers: 72 # ALL-NEXT: Total number of mappings created: 0 # ALL-NEXT: Max number of mappings used: 0 -# ALL: * Register File #2 -- IntegerPRF: +# ALL: * Register File #2 -- JIntegerPRF: # ALL-NEXT: Number of physical registers: 64 # ALL-NEXT: Total number of mappings created: 200 # ALL-NEXT: Max number of mappings used: 44 |
