[llvm] r332851 - [X86][BtVer2] Add a 'J' prefix to the PRF/RCU defs. NFC

Andrea Di Biagio via llvm-commits llvm-commits at lists.llvm.org
Mon May 21 09:30:26 PDT 2018


Author: adibiagio
Date: Mon May 21 09:30:26 2018
New Revision: 332851

URL: http://llvm.org/viewvc/llvm-project?rev=332851&view=rev
Log:
[X86][BtVer2] Add a 'J' prefix to the PRF/RCU defs. NFC

This is to keep the Jaguar model's naming convention. Processor resources all
have a 'J' prefix in the BtVer2 scheduling model.

Modified:
    llvm/trunk/lib/Target/X86/X86ScheduleBtVer2.td
    llvm/trunk/test/tools/llvm-mca/X86/BtVer2/register-files-1.s
    llvm/trunk/test/tools/llvm-mca/X86/BtVer2/register-files-2.s
    llvm/trunk/test/tools/llvm-mca/X86/BtVer2/register-files-3.s
    llvm/trunk/test/tools/llvm-mca/X86/BtVer2/register-files-4.s
    llvm/trunk/test/tools/llvm-mca/X86/BtVer2/register-files-5.s
    llvm/trunk/test/tools/llvm-mca/X86/option-all-stats-1.s
    llvm/trunk/test/tools/llvm-mca/X86/option-all-stats-2.s
    llvm/trunk/test/tools/llvm-mca/X86/option-all-views-1.s
    llvm/trunk/test/tools/llvm-mca/X86/option-all-views-2.s

Modified: llvm/trunk/lib/Target/X86/X86ScheduleBtVer2.td
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86ScheduleBtVer2.td?rev=332851&r1=332850&r2=332851&view=diff
==============================================================================
--- llvm/trunk/lib/Target/X86/X86ScheduleBtVer2.td (original)
+++ llvm/trunk/lib/Target/X86/X86ScheduleBtVer2.td Mon May 21 09:30:26 2018
@@ -41,17 +41,17 @@ def JFPU1 : ProcResource<1>; // Vector/F
 // 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]> {

Modified: llvm/trunk/test/tools/llvm-mca/X86/BtVer2/register-files-1.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-mca/X86/BtVer2/register-files-1.s?rev=332851&r1=332850&r2=332851&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-mca/X86/BtVer2/register-files-1.s (original)
+++ llvm/trunk/test/tools/llvm-mca/X86/BtVer2/register-files-1.s Mon May 21 09:30:26 2018
@@ -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

Modified: llvm/trunk/test/tools/llvm-mca/X86/BtVer2/register-files-2.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-mca/X86/BtVer2/register-files-2.s?rev=332851&r1=332850&r2=332851&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-mca/X86/BtVer2/register-files-2.s (original)
+++ llvm/trunk/test/tools/llvm-mca/X86/BtVer2/register-files-2.s Mon May 21 09:30:26 2018
@@ -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

Modified: llvm/trunk/test/tools/llvm-mca/X86/BtVer2/register-files-3.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-mca/X86/BtVer2/register-files-3.s?rev=332851&r1=332850&r2=332851&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-mca/X86/BtVer2/register-files-3.s (original)
+++ llvm/trunk/test/tools/llvm-mca/X86/BtVer2/register-files-3.s Mon May 21 09:30:26 2018
@@ -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

Modified: llvm/trunk/test/tools/llvm-mca/X86/BtVer2/register-files-4.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-mca/X86/BtVer2/register-files-4.s?rev=332851&r1=332850&r2=332851&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-mca/X86/BtVer2/register-files-4.s (original)
+++ llvm/trunk/test/tools/llvm-mca/X86/BtVer2/register-files-4.s Mon May 21 09:30:26 2018
@@ -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

Modified: llvm/trunk/test/tools/llvm-mca/X86/BtVer2/register-files-5.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-mca/X86/BtVer2/register-files-5.s?rev=332851&r1=332850&r2=332851&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-mca/X86/BtVer2/register-files-5.s (original)
+++ llvm/trunk/test/tools/llvm-mca/X86/BtVer2/register-files-5.s Mon May 21 09:30:26 2018
@@ -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

Modified: llvm/trunk/test/tools/llvm-mca/X86/option-all-stats-1.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-mca/X86/option-all-stats-1.s?rev=332851&r1=332850&r2=332851&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-mca/X86/option-all-stats-1.s (original)
+++ llvm/trunk/test/tools/llvm-mca/X86/option-all-stats-1.s Mon May 21 09:30:26 2018
@@ -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

Modified: llvm/trunk/test/tools/llvm-mca/X86/option-all-stats-2.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-mca/X86/option-all-stats-2.s?rev=332851&r1=332850&r2=332851&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-mca/X86/option-all-stats-2.s (original)
+++ llvm/trunk/test/tools/llvm-mca/X86/option-all-stats-2.s Mon May 21 09:30:26 2018
@@ -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

Modified: llvm/trunk/test/tools/llvm-mca/X86/option-all-views-1.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-mca/X86/option-all-views-1.s?rev=332851&r1=332850&r2=332851&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-mca/X86/option-all-views-1.s (original)
+++ llvm/trunk/test/tools/llvm-mca/X86/option-all-views-1.s Mon May 21 09:30:26 2018
@@ -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

Modified: llvm/trunk/test/tools/llvm-mca/X86/option-all-views-2.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-mca/X86/option-all-views-2.s?rev=332851&r1=332850&r2=332851&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-mca/X86/option-all-views-2.s (original)
+++ llvm/trunk/test/tools/llvm-mca/X86/option-all-views-2.s Mon May 21 09:30:26 2018
@@ -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




More information about the llvm-commits mailing list