Update xgl from commit 79803ba8

* Add Navi31 support
GPUOpen-Drivers · Dec 12, 2022 · 8aa0e76 · 8aa0e76
1 parent b358df5
commit 8aa0e76
Show file tree

Hide file tree

Showing 23 changed files with 663 additions and 2 deletions.
diff --git a/cmake/XglCompileDefinitions.cmake b/cmake/XglCompileDefinitions.cmake
@@ -55,6 +55,18 @@ macro(xgl_set_compile_definitions)
         target_compile_definitions(xgl PRIVATE VKI_BUILD_NAVI12=1)
     endif()
 
+#if VKI_BUILD_GFX11
+    if(XGL_BUILD_GFX11)
+        target_compile_definitions(xgl PRIVATE VKI_BUILD_GFX11=1)
+    endif()
+#endif
+
+#if VKI_BUILD_NAVI31
+    if(XGL_BUILD_NAVI31)
+        target_compile_definitions(xgl PRIVATE VKI_BUILD_NAVI31=1)
+    endif()
+#endif
+
 #if VKI_RAY_TRACING
     if (VKI_RAY_TRACING)
         target_compile_definitions(xgl PRIVATE VKI_RAY_TRACING=1)

diff --git a/cmake/XglOptions.cmake b/cmake/XglOptions.cmake
@@ -39,6 +39,14 @@ macro(xgl_options)
 
     option(XGL_BUILD_NAVI12 "Build vulkan for Navi12" ON)
 
+#if VKI_BUILD_GFX11
+    option(XGL_BUILD_GFX11 "Build vulkan for GFX11" ON)
+#endif
+
+#if VKI_BUILD_NAVI31
+    option(XGL_BUILD_NAVI31 "Build vulkan for Navi31" ON)
+#endif
+
     option(XGL_BUILD_TESTS "Build tests?" OFF)
 
     option(XGL_BUILD_TOOLS "Build tools?" OFF)

diff --git a/cmake/XglOverrides.cmake b/cmake/XglOverrides.cmake
@@ -121,6 +121,10 @@ macro(xgl_overrides_pal)
 
     set(PAL_BUILD_NAVI24 ON CACHE BOOL "${PROJECT_NAME} override." FORCE)
 
+#if VKI_BUILD_NAVI31
+    set(PAL_BUILD_NAVI31 ${XGL_BUILD_NAVI31} CACHE BOOL "${PROJECT_NAME} override." FORCE)
+#endif
+
     # Wayland
     set(PAL_BUILD_WAYLAND ${BUILD_WAYLAND_SUPPORT} CACHE BOOL "Build PAL with Wayland support" FORCE)
 
@@ -147,6 +151,14 @@ macro(xgl_overrides_vkgc)
 
     set(LLPC_BUILD_NAVI12 ${XGL_BUILD_NAVI12} CACHE BOOL "${PROJECT_NAME} override." FORCE)
 
+#if VKI_BUILD_GFX11
+    set(LLPC_BUILD_GFX11 ${XGL_BUILD_GFX11} CACHE BOOL "${PROJECT_NAME} override." FORCE)
+#endif
+
+#if VKI_BUILD_NAVI31
+    set(LLPC_BUILD_NAVI31 ${XGL_BUILD_NAVI31} CACHE BOOL "${PROJECT_NAME} override." FORCE)
+#endif
+
     set(LLPC_ENABLE_WERROR ${ICD_ANALYSIS_WARNINGS_AS_ERRORS} CACHE BOOL "${PROJECT_NAME} override." FORCE)
 
 endmacro()

diff --git a/icd/api/appopt/shader_profiles/llpc/gfxIp11_0/Navi31/Rage2/profile.json b/icd/api/appopt/shader_profiles/llpc/gfxIp11_0/Navi31/Rage2/profile.json
@@ -0,0 +1,52 @@
+{
+  "entries": [
+    {
+      "pattern": {
+        "cs": {
+          "codeHash": "0x5d57d7de1344947e 15d3f1264dda4995"
+        }
+      },
+      "action": {
+        "cs": {
+          "waveSize": 32
+        }
+      }
+    },
+    {
+      "pattern": {
+        "ps": {
+          "codeHash": "0x0d3bb534d7f86407 30acc351f2e2c8ae"
+        }
+      },
+      "action": {
+        "ps": {
+          "waveSize": 32
+        }
+      }
+    },
+    {
+      "pattern": {
+        "ps": {
+          "codeHash": "0x0596c40b7d193021 3788eba5a15d6542"
+        }
+      },
+      "action": {
+        "ps": {
+          "useSiScheduler": true
+        }
+      }
+    },
+    {
+      "pattern": {
+        "cs": {
+          "codeHash": "0xa96e3b3d24510bd0 a4f37c25eac9ee41"
+        }
+      },
+      "action": {
+        "cs": {
+          "waveSize": 32
+        }
+      }
+    }
+  ]
+}
diff --git a/icd/api/appopt/shader_profiles/llpc/gfxIp11_0/Navi31/SniperElite5/profile.json b/icd/api/appopt/shader_profiles/llpc/gfxIp11_0/Navi31/SniperElite5/profile.json
@@ -0,0 +1,16 @@
+{
+  "entries": [
+    {
+      "pattern": {
+        "ps": {
+          "codeHash": "0x1c444eac602c4bb7 da09bb36370881e7"
+        }
+      },
+      "action": {
+        "ps": {
+          "allowReZ": 1
+        }
+      }
+    }
+  ]
+}
diff --git a/icd/api/appopt/shader_profiles/llpc/gfxIp11_0/Navi31/WolfensteinYoungblood/profile.json b/icd/api/appopt/shader_profiles/llpc/gfxIp11_0/Navi31/WolfensteinYoungblood/profile.json
@@ -0,0 +1,18 @@
+{
+  "entries": [
+    {
+      "pattern": {
+        "shaderOnly": true,
+        "cs": {
+          "codeHash": "0x8d8b60de0782642b f143d8ecd6de6b11"
+        }
+      },
+      "action": {
+        "cs": {
+          "vgprLimit": 48,
+          "useSiScheduler": true
+        }
+      }
+    }
+  ]
+}
diff --git a/icd/api/appopt/shader_profiles/llpc/gfxIp11_0/generic/Quake2RTX/profile.json b/icd/api/appopt/shader_profiles/llpc/gfxIp11_0/generic/Quake2RTX/profile.json
@@ -0,0 +1,68 @@
+{
+  "entries": [
+    {
+      "pattern": {
+        "cs": {
+          "codeHash": "0xE128CF59638C2E1C 22C6B575129AB32D"
+        }
+      },
+      "action": {
+        "cs": {
+          "favorLatencyHiding": true
+        }
+      }
+    },
+    {
+      "pattern": {
+        "cs": {
+          "codeHash": "0x45911829EC7E9028 123B4766DB4CD890"
+        }
+      },
+      "action": {
+        "cs": {
+          "favorLatencyHiding": true
+        }
+      }
+    },
+    {
+      "pattern": {
+        "shaderOnly": true,
+        "cs": {
+          "codeHash": "0x59b0428f3cd67115 310d150c5fe4134b"
+        }
+      },
+      "action": {
+        "cs": {
+          "useSiScheduler": true
+        }
+      }
+    },
+    {
+      "pattern": {
+        "shaderOnly": true,
+        "cs": {
+          "codeHash": "0x9ad5144cc78368a0 7701746dcf8cce1e"
+        }
+      },
+      "action": {
+        "cs": {
+          "maxWavesPerCu": 4,
+          "enableLoadScalarizer": true
+        }
+      }
+    },
+    {
+      "pattern": {
+        "shaderOnly": true,
+        "cs": {
+          "codeHash": "0x22cdbcc4784fcaab 88f70575c05dde23"
+        }
+      },
+      "action": {
+        "cs": {
+          "maxWavesPerCu": 4
+        }
+      }
+    }
+  ]
+}
diff --git a/icd/api/appopt/shader_profiles/llpc/gfxIp11_0/generic/RedDeadRedemption2/profile.json b/icd/api/appopt/shader_profiles/llpc/gfxIp11_0/generic/RedDeadRedemption2/profile.json
@@ -0,0 +1,92 @@
+{
+  "entries": [
+    {
+      "pattern": {
+        "cs": {
+          "codeHash": "0xe63764d8ab075d10 2c2fb8c0ca4995e4"
+        }
+      },
+      "action": {
+        "cs": {
+          "waveSize": 32
+        }
+      }
+    },
+    {
+      "pattern": {
+        "cs": {
+          "codeHash": "0xfd3d6fd85419a887 550d6f775d85b05c"
+        }
+      },
+      "action": {
+        "cs": {
+          "wgpMode": 2
+        }
+      }
+    },
+    {
+      "pattern": {
+        "ps": {
+          "codeHash": "0x3d177a356fac334d 75f708c573abe471"
+        }
+      },
+      "action": {
+        "ps": {
+          "waveSize": 32
+        }
+      }
+    },
+    {
+      "pattern": {
+        "ps": {
+          "codeHash": "0xdf68dfd3aa548e8f d59706aea9453f02"
+        }
+      },
+      "action": {
+        "ps": {
+          "allowReZ": 1,
+          "waveSize": 32
+        }
+      }
+    },
+    {
+      "pattern": {
+        "ps": {
+          "codeHash": "0x0ac33e936d12791e 4b5872346173e04a"
+        }
+      },
+      "action": {
+        "ps": {
+          "waveSize": 32
+        }
+      }
+    },
+    {
+      "pattern": {
+        "shaderOnly": true,
+        "cs": {
+          "codeHash": "0xae188551d7b56e7f 6b8c4c0bff97cd9b"
+        }
+      },
+      "action": {
+        "cs": {
+          "waveSize": 32
+        }
+      }
+    },
+    {
+      "pattern": {
+        "shaderOnly": true,
+        "cs": {
+          "codeHash": "0xcb6b71cf1d45ede1 b45c86d78c780ddf"
+        }
+      },
+      "action": {
+        "cs": {
+          "waveSize": 32,
+          "useSiScheduler": true
+        }
+      }
+    }
+  ]
+}
diff --git a/icd/api/appopt/shader_profiles/llpc/gfxIp11_0/generic/Talos/profile.json b/icd/api/appopt/shader_profiles/llpc/gfxIp11_0/generic/Talos/profile.json
@@ -0,0 +1,26 @@
+{
+  "entries": [
+    {
+      "pattern": {
+        "ps": {
+          "codeHash": "0x0bbce6fd9ad36ffc 3b5ffeb59cf52b9e"
+        }
+      },
+      "action": {
+        "ps": {
+          "waveSize": 32
+        }
+      }
+    },
+    {
+      "pattern": {
+        "always": true
+      },
+      "action": {
+        "cs": {
+          "threadGroupSwizzleMode": "_4x4"
+        }
+      }
+    }
+  ]
+}
diff --git a/icd/api/appopt/shader_profiles/llpc/gfxIp11_0/generic/ThreeKingdoms/profile.json b/icd/api/appopt/shader_profiles/llpc/gfxIp11_0/generic/ThreeKingdoms/profile.json
@@ -0,0 +1,31 @@
+{
+  "entries": [
+    {
+      "pattern": {
+        "always": true
+      },
+      "action": {
+        "ps": {
+          "nsaThreshold": 2
+        },
+        "gs": {
+          "nsaThreshold": 2
+        }
+      }
+    },
+    {
+      "pattern": {
+        "gs": {
+          "codeHash": "0xf2949c1ef37a9e30 5dd80203f449f5b2"
+        }
+      },
+      "action": {
+        "gs": {
+          "nsaThreshold": 2,
+          "aggressiveInvariantLoads": "EnableOptimization",
+          "vgprLimit": 128
+        }
+      }
+    }
+  ]
+}
diff --git a/icd/api/appopt/shader_profiles/llpc/gfxIp11_0/generic/WarHammerIII/profile.json b/icd/api/appopt/shader_profiles/llpc/gfxIp11_0/generic/WarHammerIII/profile.json
@@ -0,0 +1,16 @@
+{
+  "entries": [
+    {
+      "pattern": {
+        "ps": {
+          "codeHash": "0x3750559b33d6c366 198c0842f95c0bcc"
+        }
+      },
+      "action": {
+        "ps": {
+          "disableCodeSinking": true
+        }
+      }
+    }
+  ]
+}