Rename CacheKey-related files to Stream

Bug: dawn:1480, dawn:1481
Change-Id: If61f0466d79e7759ed32c4ddf541ad0c17247996
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/96904
Reviewed-by: Loko Kung <lokokung@google.com>
Commit-Queue: Austin Eng <enga@chromium.org>

generator/dawn_json_generator.py

@@ -950,6 +950,10 @@ class MultiGeneratorFromDawnJSON(Generator):
                 FileRender('dawn/native/api_absl_format.cpp',
                            'src/' + native_dir + '/' + api + '_absl_format_autogen.cpp',
                            frontend_params))
+            renders.append(
+                FileRender(
+                    'dawn/native/api_StreamImpl.cpp', 'src/' + native_dir +
+                    '/' + api + '_StreamImpl_autogen.cpp', frontend_params))
             renders.append(
                 FileRender('dawn/native/ObjectType.h',
                            'src/' + native_dir + '/ObjectType_autogen.h',
@@ -958,10 +962,6 @@ class MultiGeneratorFromDawnJSON(Generator):
                 FileRender('dawn/native/ObjectType.cpp',
                            'src/' + native_dir + '/ObjectType_autogen.cpp',
                            frontend_params))
-            renders.append(
-                FileRender('dawn/native/CacheKey.cpp',
-                           'src/' + native_dir + '/CacheKey_autogen.cpp',
-                           frontend_params))
 
         if 'wire' in targets:
             params_dawn_wire = parse_json(loaded_json,

src/dawn/native/BUILD.gn

@@ -97,9 +97,9 @@ dawn_json_generator("utils_gen") {
     "src/dawn/native/ValidationUtils_autogen.cpp",
     "src/dawn/native/webgpu_absl_format_autogen.h",
     "src/dawn/native/webgpu_absl_format_autogen.cpp",
+    "src/dawn/native/webgpu_StreamImpl_autogen.cpp",
     "src/dawn/native/ObjectType_autogen.h",
     "src/dawn/native/ObjectType_autogen.cpp",
-    "src/dawn/native/CacheKey_autogen.cpp",
   ]
 }
 
@@ -200,7 +200,6 @@ source_set("sources") {
     "Buffer.h",
     "CacheKey.cpp",
     "CacheKey.h",
-    "CacheKeyImplTint.cpp",
     "CacheRequest.cpp",
     "CacheRequest.h",
     "CacheResult.h",
@@ -316,6 +315,7 @@ source_set("sources") {
     "ShaderModule.h",
     "StagingBuffer.cpp",
     "StagingBuffer.h",
+    "StreamImplTint.cpp",
     "Subresource.cpp",
     "Subresource.h",
     "SubresourceStorage.h",
@@ -395,7 +395,6 @@ source_set("sources") {
       "d3d12/BufferD3D12.h",
       "d3d12/CPUDescriptorHeapAllocationD3D12.cpp",
       "d3d12/CPUDescriptorHeapAllocationD3D12.h",
-      "d3d12/CacheKeyD3D12.cpp",
       "d3d12/CommandAllocatorManager.cpp",
       "d3d12/CommandAllocatorManager.h",
       "d3d12/CommandBufferD3D12.cpp",
@@ -456,6 +455,7 @@ source_set("sources") {
       "d3d12/StagingBufferD3D12.h",
       "d3d12/StagingDescriptorAllocatorD3D12.cpp",
       "d3d12/StagingDescriptorAllocatorD3D12.h",
+      "d3d12/StreamImplD3D12.cpp",
       "d3d12/SwapChainD3D12.cpp",
       "d3d12/SwapChainD3D12.h",
       "d3d12/TextureCopySplitter.cpp",
@@ -611,7 +611,6 @@ source_set("sources") {
       "vulkan/BindGroupVk.h",
       "vulkan/BufferVk.cpp",
       "vulkan/BufferVk.h",
-      "vulkan/CacheKeyVk.cpp",
       "vulkan/CommandBufferVk.cpp",
       "vulkan/CommandBufferVk.h",
       "vulkan/CommandRecordingContext.h",
@@ -650,6 +649,7 @@ source_set("sources") {
       "vulkan/ShaderModuleVk.h",
       "vulkan/StagingBufferVk.cpp",
       "vulkan/StagingBufferVk.h",
+      "vulkan/StreamImplVk.cpp",
       "vulkan/SwapChainVk.cpp",
       "vulkan/SwapChainVk.h",
       "vulkan/TextureVk.cpp",

src/dawn/native/CMakeLists.txt

@@ -59,7 +59,6 @@ target_sources(dawn_native PRIVATE
     "CachedObject.h"
     "CacheKey.cpp"
     "CacheKey.h"
-    "CacheKeyImplTint.cpp"
     "CacheRequest.cpp"
     "CacheRequest.h"
     "CacheResult.h"
@@ -173,6 +172,7 @@ target_sources(dawn_native PRIVATE
     "ShaderModule.h"
     "StagingBuffer.cpp"
     "StagingBuffer.h"
+    "StreamImplTint.cpp"
     "Subresource.cpp"
     "Subresource.h"
     "SubresourceStorage.h"
@@ -264,7 +264,6 @@ if (DAWN_ENABLE_D3D12)
         "d3d12/CPUDescriptorHeapAllocationD3D12.h"
         "d3d12/CommandAllocatorManager.cpp"
         "d3d12/CommandAllocatorManager.h"
-        "d3d12/CacheKeyD3D12.cpp"
         "d3d12/CommandBufferD3D12.cpp"
         "d3d12/CommandBufferD3D12.h"
         "d3d12/CommandRecordingContext.cpp"
@@ -323,6 +322,7 @@ if (DAWN_ENABLE_D3D12)
         "d3d12/StagingBufferD3D12.h"
         "d3d12/StagingDescriptorAllocatorD3D12.cpp"
         "d3d12/StagingDescriptorAllocatorD3D12.h"
+        "d3d12/StreamImplD3D12.cpp"
         "d3d12/SwapChainD3D12.cpp"
         "d3d12/SwapChainD3D12.h"
         "d3d12/TextureCopySplitter.cpp"
@@ -493,7 +493,6 @@ if (DAWN_ENABLE_VULKAN)
         "vulkan/BindGroupVk.h"
         "vulkan/BufferVk.cpp"
         "vulkan/BufferVk.h"
-        "vulkan/CacheKeyVk.cpp"
         "vulkan/CommandBufferVk.cpp"
         "vulkan/CommandBufferVk.h"
         "vulkan/CommandRecordingContext.h"
@@ -532,6 +531,7 @@ if (DAWN_ENABLE_VULKAN)
         "vulkan/ShaderModuleVk.h"
         "vulkan/StagingBufferVk.cpp"
         "vulkan/StagingBufferVk.h"
+        "vulkan/StreamImplVk.cpp"
         "vulkan/SwapChainVk.cpp"
         "vulkan/SwapChainVk.h"
         "vulkan/TextureVk.cpp"

src/dawn/native/CacheKey.cpp

@@ -14,10 +14,6 @@
 
 #include "dawn/native/CacheKey.h"
 
-#include <iomanip>
-#include <string>
-#include <string_view>
-
 namespace dawn::native {
 
 template <>

src/dawn/native/StreamImplTint.cpp

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "dawn/native/CacheKey.h"
+#include "dawn/native/stream/Stream.h"
 
 #include "tint/tint.h"
 

src/dawn/native/d3d12/StreamImplD3D12.cpp

@@ -14,8 +14,8 @@
 
 #include "dawn/common/Assert.h"
 #include "dawn/common/Constants.h"
-#include "dawn/native/CacheKey.h"
 #include "dawn/native/d3d12/d3d12_platform.h"
+#include "dawn/native/stream/Stream.h"
 
 namespace dawn::native {
 

src/dawn/native/vulkan/StreamImplVk.cpp

@@ -17,7 +17,7 @@
 
 #include "dawn/common/Assert.h"
 #include "dawn/common/vulkan_platform.h"
-#include "dawn/native/CacheKey.h"
+#include "dawn/native/stream/Stream.h"
 #include "dawn/native/vulkan/RenderPassCache.h"
 
 #include "icd/generated/vk_typemap_helper.h"

src/dawn/tests/BUILD.gn

@@ -260,12 +260,12 @@ dawn_test("dawn_unittests") {
     "unittests/ToBackendTests.cpp",
     "unittests/TypedIntegerTests.cpp",
     "unittests/native/BlobTests.cpp",
-    "unittests/native/CacheKeyTests.cpp",
     "unittests/native/CacheRequestTests.cpp",
     "unittests/native/CommandBufferEncodingTests.cpp",
     "unittests/native/CreatePipelineAsyncTaskTests.cpp",
     "unittests/native/DestroyObjectTests.cpp",
     "unittests/native/DeviceCreationTests.cpp",
+    "unittests/native/StreamTests.cpp",
     "unittests/validation/BindGroupValidationTests.cpp",
     "unittests/validation/BufferValidationTests.cpp",
     "unittests/validation/CommandBufferValidationTests.cpp",