Starting rename of executable_layout -> pipeline_layout.

Progress on #10144.
iree-org · Aug 22, 2022 · 347660c · 347660c
1 parent c234161
commit 347660c
Show file tree

Hide file tree

Showing 43 changed files with 86 additions and 86 deletions.
diff --git a/experimental/rocm/CMakeLists.txt b/experimental/rocm/CMakeLists.txt
@@ -35,14 +35,14 @@ iree_cc_library(
     "rocm_event.h"
     "event_semaphore.c"
     "event_semaphore.h"
-    "executable_layout.c"
-    "executable_layout.h"
     "direct_command_buffer.c"
     "direct_command_buffer.h"
     "native_executable.c"
     "native_executable.h"
     "nop_executable_cache.c"
     "nop_executable_cache.h"
+    "pipeline_layout.c"
+    "pipeline_layout.h"
     "status_util.c"
     "status_util.h"
   INCLUDES

diff --git a/experimental/rocm/direct_command_buffer.c b/experimental/rocm/direct_command_buffer.c
@@ -11,8 +11,8 @@
 #include <stdint.h>
 
 #include "experimental/rocm/dynamic_symbols.h"
-#include "experimental/rocm/executable_layout.h"
 #include "experimental/rocm/native_executable.h"
+#include "experimental/rocm/pipeline_layout.h"
 #include "experimental/rocm/rocm_buffer.h"
 #include "experimental/rocm/status_util.h"
 #include "iree/base/api.h"

diff --git a/experimental/rocm/native_executable.c b/experimental/rocm/native_executable.c
@@ -9,7 +9,7 @@
 #include <stddef.h>
 
 #include "experimental/rocm/dynamic_symbols.h"
-#include "experimental/rocm/executable_layout.h"
+#include "experimental/rocm/pipeline_layout.h"
 #include "experimental/rocm/status_util.h"
 #include "iree/base/api.h"
 #include "iree/base/tracing.h"

diff --git a/experimental/rocm/executable_layout.c → experimental/rocm/pipeline_layout.c b/experimental/rocm/executable_layout.c → experimental/rocm/pipeline_layout.c
diff --git a/experimental/rocm/executable_layout.h → experimental/rocm/pipeline_layout.h b/experimental/rocm/executable_layout.h → experimental/rocm/pipeline_layout.h
@@ -4,8 +4,8 @@
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifndef IREE_HAL_ROCM_EXECUTABLE_LAYOUT_H_
-#define IREE_HAL_ROCM_EXECUTABLE_LAYOUT_H_
+#ifndef IREE_HAL_ROCM_PIPELINE_LAYOUT_H_
+#define IREE_HAL_ROCM_PIPELINE_LAYOUT_H_
 
 #include "experimental/rocm/context_wrapper.h"
 #include "iree/base/api.h"
@@ -59,4 +59,4 @@ iree_host_size_t iree_hal_rocm_executable_layout_num_constants(
 }  // extern "C"
 #endif  // __cplusplus
 
-#endif  // IREE_HAL_ROCM_EXECUTABLE_LAYOUT_H_
+#endif  // IREE_HAL_ROCM_PIPELINE_LAYOUT_H_
diff --git a/experimental/rocm/rocm_device.c b/experimental/rocm/rocm_device.c
@@ -14,8 +14,8 @@
 #include "experimental/rocm/direct_command_buffer.h"
 #include "experimental/rocm/dynamic_symbols.h"
 #include "experimental/rocm/event_semaphore.h"
-#include "experimental/rocm/executable_layout.h"
 #include "experimental/rocm/nop_executable_cache.h"
+#include "experimental/rocm/pipeline_layout.h"
 #include "experimental/rocm/rocm_allocator.h"
 #include "experimental/rocm/rocm_event.h"
 #include "experimental/rocm/status_util.h"

diff --git a/runtime/iree.natvis b/runtime/iree.natvis
@@ -459,7 +459,7 @@
 <!--=========================================================================-->
 
 <!--=========================================================================-->
-<!-- iree/hal/executable_layout.h -->
+<!-- iree/hal/pipeline_layout.h -->
 <!--=========================================================================-->
 
 <!--=========================================================================-->

diff --git a/runtime/src/iree/hal/BUILD b/runtime/src/iree/hal/BUILD
@@ -51,10 +51,10 @@ iree_runtime_cc_library(
         "executable.h",
         "executable_cache.c",
         "executable_cache.h",
-        "executable_layout.c",
-        "executable_layout.h",
         "fence.c",
         "fence.h",
+        "pipeline_layout.c",
+        "pipeline_layout.h",
         "resource.h",
         "semaphore.c",
         "semaphore.h",

diff --git a/runtime/src/iree/hal/CMakeLists.txt b/runtime/src/iree/hal/CMakeLists.txt
@@ -44,10 +44,10 @@ iree_cc_library(
     "executable.h"
     "executable_cache.c"
     "executable_cache.h"
-    "executable_layout.c"
-    "executable_layout.h"
     "fence.c"
     "fence.h"
+    "pipeline_layout.c"
+    "pipeline_layout.h"
     "resource.h"
     "semaphore.c"
     "semaphore.h"

diff --git a/runtime/src/iree/hal/api.h b/runtime/src/iree/hal/api.h
@@ -9,21 +9,21 @@
 #ifndef IREE_HAL_API_H_
 #define IREE_HAL_API_H_
 
-#include "iree/hal/allocator.h"          // IWYU pragma: export
-#include "iree/hal/buffer.h"             // IWYU pragma: export
-#include "iree/hal/buffer_view.h"        // IWYU pragma: export
-#include "iree/hal/buffer_view_util.h"   // IWYU pragma: export
-#include "iree/hal/command_buffer.h"     // IWYU pragma: export
-#include "iree/hal/device.h"             // IWYU pragma: export
-#include "iree/hal/driver.h"             // IWYU pragma: export
-#include "iree/hal/driver_registry.h"    // IWYU pragma: export
-#include "iree/hal/event.h"              // IWYU pragma: export
-#include "iree/hal/executable.h"         // IWYU pragma: export
-#include "iree/hal/executable_cache.h"   // IWYU pragma: export
-#include "iree/hal/executable_layout.h"  // IWYU pragma: export
-#include "iree/hal/fence.h"              // IWYU pragma: export
-#include "iree/hal/resource.h"           // IWYU pragma: export
-#include "iree/hal/semaphore.h"          // IWYU pragma: export
-#include "iree/hal/string_util.h"        // IWYU pragma: export
+#include "iree/hal/allocator.h"         // IWYU pragma: export
+#include "iree/hal/buffer.h"            // IWYU pragma: export
+#include "iree/hal/buffer_view.h"       // IWYU pragma: export
+#include "iree/hal/buffer_view_util.h"  // IWYU pragma: export
+#include "iree/hal/command_buffer.h"    // IWYU pragma: export
+#include "iree/hal/device.h"            // IWYU pragma: export
+#include "iree/hal/driver.h"            // IWYU pragma: export
+#include "iree/hal/driver_registry.h"   // IWYU pragma: export
+#include "iree/hal/event.h"             // IWYU pragma: export
+#include "iree/hal/executable.h"        // IWYU pragma: export
+#include "iree/hal/executable_cache.h"  // IWYU pragma: export
+#include "iree/hal/fence.h"             // IWYU pragma: export
+#include "iree/hal/pipeline_layout.h"   // IWYU pragma: export
+#include "iree/hal/resource.h"          // IWYU pragma: export
+#include "iree/hal/semaphore.h"         // IWYU pragma: export
+#include "iree/hal/string_util.h"       // IWYU pragma: export
 
 #endif  // IREE_HAL_API_H_
diff --git a/runtime/src/iree/hal/command_buffer.h b/runtime/src/iree/hal/command_buffer.h
@@ -15,7 +15,7 @@
 #include "iree/hal/buffer.h"
 #include "iree/hal/event.h"
 #include "iree/hal/executable.h"
-#include "iree/hal/executable_layout.h"
+#include "iree/hal/pipeline_layout.h"
 #include "iree/hal/resource.h"
 
 #ifdef __cplusplus

diff --git a/runtime/src/iree/hal/command_buffer_validation.c b/runtime/src/iree/hal/command_buffer_validation.c
@@ -18,7 +18,7 @@
 #include "iree/hal/device.h"
 #include "iree/hal/event.h"
 #include "iree/hal/executable.h"
-#include "iree/hal/executable_layout.h"
+#include "iree/hal/pipeline_layout.h"
 #include "iree/hal/resource.h"
 
 // Returns success iff the queue supports the given command categories.

diff --git a/runtime/src/iree/hal/cts/CMakeLists.txt b/runtime/src/iree/hal/cts/CMakeLists.txt
@@ -13,7 +13,7 @@ set(IREE_ALL_CTS_TESTS
   "driver"
   "event"
   "executable_cache"
-  "executable_layout"
+  "pipeline_layout"
   "semaphore"
   "semaphore_submission"
   PARENT_SCOPE
@@ -134,9 +134,9 @@ iree_cc_library(
 
 iree_cc_library(
   NAME
-    executable_layout_test_library
+    executable_cache_test_library
   HDRS
-    "executable_layout_test.h"
+    "executable_cache_test.h"
   DEPS
     ::cts_test_base
     iree::base
@@ -146,9 +146,9 @@ iree_cc_library(
 
 iree_cc_library(
   NAME
-    executable_cache_test_library
+    pipeline_layout_test_library
   HDRS
-    "executable_cache_test.h"
+    "pipeline_layout_test.h"
   DEPS
     ::cts_test_base
     iree::base

diff --git a/...src/iree/hal/cts/executable_layout_test.h → ...e/src/iree/hal/cts/pipeline_layout_test.h b/...src/iree/hal/cts/executable_layout_test.h → ...e/src/iree/hal/cts/pipeline_layout_test.h
@@ -4,8 +4,8 @@
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifndef IREE_HAL_CTS_EXECUTABLE_LAYOUT_TEST_H_
-#define IREE_HAL_CTS_EXECUTABLE_LAYOUT_TEST_H_
+#ifndef IREE_HAL_CTS_PIPELINE_LAYOUT_TEST_H_
+#define IREE_HAL_CTS_PIPELINE_LAYOUT_TEST_H_
 
 #include "iree/base/api.h"
 #include "iree/hal/api.h"
@@ -17,9 +17,9 @@ namespace iree {
 namespace hal {
 namespace cts {
 
-class executable_layout_test : public CtsTestBase {};
+class pipeline_layout_test : public CtsTestBase {};
 
-TEST_P(executable_layout_test, CreateWithNoLayouts) {
+TEST_P(pipeline_layout_test, CreateWithNoLayouts) {
   iree_hal_executable_layout_t* executable_layout = NULL;
   IREE_ASSERT_OK(iree_hal_executable_layout_create(
       device_, /*push_constants=*/0, /*set_layout_count=*/0, NULL,
@@ -28,7 +28,7 @@ TEST_P(executable_layout_test, CreateWithNoLayouts) {
   iree_hal_executable_layout_release(executable_layout);
 }
 
-TEST_P(executable_layout_test, CreateWithPushConstants) {
+TEST_P(pipeline_layout_test, CreateWithPushConstants) {
   iree_hal_executable_layout_t* executable_layout = NULL;
   // Note: The Vulkan maxPushConstantsSize limit must be at least 128 bytes:
   // https://www.khronos.org/registry/vulkan/specs/1.2/html/vkspec.html#limits-minmax
@@ -39,7 +39,7 @@ TEST_P(executable_layout_test, CreateWithPushConstants) {
   iree_hal_executable_layout_release(executable_layout);
 }
 
-TEST_P(executable_layout_test, CreateWithOneLayout) {
+TEST_P(pipeline_layout_test, CreateWithOneLayout) {
   iree_hal_descriptor_set_layout_t* descriptor_set_layout = NULL;
   iree_hal_descriptor_set_layout_binding_t descriptor_set_layout_bindings[] = {
       {/*binding=*/0, /*type=*/IREE_HAL_DESCRIPTOR_TYPE_STORAGE_BUFFER},
@@ -59,7 +59,7 @@ TEST_P(executable_layout_test, CreateWithOneLayout) {
   iree_hal_descriptor_set_layout_release(descriptor_set_layout);
 }
 
-TEST_P(executable_layout_test, CreateWithTwoLayouts) {
+TEST_P(pipeline_layout_test, CreateWithTwoLayouts) {
   iree_hal_descriptor_set_layout_t* descriptor_set_layouts[2] = {NULL};
   iree_hal_descriptor_set_layout_binding_t layout_bindings_0[] = {
       {/*binding=*/0, /*type=*/IREE_HAL_DESCRIPTOR_TYPE_STORAGE_BUFFER},
@@ -94,4 +94,4 @@ TEST_P(executable_layout_test, CreateWithTwoLayouts) {
 }  // namespace hal
 }  // namespace iree
 
-#endif  // IREE_HAL_CTS_EXECUTABLE_LAYOUT_TEST_H_
+#endif  // IREE_HAL_CTS_PIPELINE_LAYOUT_TEST_H_
diff --git a/runtime/src/iree/hal/device.h b/runtime/src/iree/hal/device.h
@@ -16,7 +16,7 @@
 #include "iree/hal/command_buffer.h"
 #include "iree/hal/event.h"
 #include "iree/hal/executable_cache.h"
-#include "iree/hal/executable_layout.h"
+#include "iree/hal/pipeline_layout.h"
 #include "iree/hal/fence.h"
 #include "iree/hal/resource.h"
 #include "iree/hal/semaphore.h"

diff --git a/runtime/src/iree/hal/drivers/cuda/CMakeLists.txt b/runtime/src/iree/hal/drivers/cuda/CMakeLists.txt
@@ -29,14 +29,14 @@ iree_cc_library(
     "cuda_event.h"
     "event_semaphore.c"
     "event_semaphore.h"
-    "executable_layout.c"
-    "executable_layout.h"
     "graph_command_buffer.c"
     "graph_command_buffer.h"
     "native_executable.c"
     "native_executable.h"
     "nop_executable_cache.c"
     "nop_executable_cache.h"
+    "pipeline_layout.c"
+    "pipeline_layout.h"
     "status_util.c"
     "status_util.h"
     "stream_command_buffer.c"

diff --git a/runtime/src/iree/hal/drivers/cuda/cuda_device.c b/runtime/src/iree/hal/drivers/cuda/cuda_device.c
@@ -17,9 +17,9 @@
 #include "iree/hal/drivers/cuda/cuda_event.h"
 #include "iree/hal/drivers/cuda/dynamic_symbols.h"
 #include "iree/hal/drivers/cuda/event_semaphore.h"
-#include "iree/hal/drivers/cuda/executable_layout.h"
 #include "iree/hal/drivers/cuda/graph_command_buffer.h"
 #include "iree/hal/drivers/cuda/nop_executable_cache.h"
+#include "iree/hal/drivers/cuda/pipeline_layout.h"
 #include "iree/hal/drivers/cuda/status_util.h"
 #include "iree/hal/drivers/cuda/stream_command_buffer.h"
 #include "iree/hal/utils/buffer_transfer.h"

diff --git a/runtime/src/iree/hal/drivers/cuda/graph_command_buffer.c b/runtime/src/iree/hal/drivers/cuda/graph_command_buffer.c
@@ -14,8 +14,8 @@
 #include "iree/base/tracing.h"
 #include "iree/hal/drivers/cuda/cuda_buffer.h"
 #include "iree/hal/drivers/cuda/dynamic_symbols.h"
-#include "iree/hal/drivers/cuda/executable_layout.h"
 #include "iree/hal/drivers/cuda/native_executable.h"
+#include "iree/hal/drivers/cuda/pipeline_layout.h"
 #include "iree/hal/drivers/cuda/status_util.h"
 #include "iree/hal/utils/resource_set.h"
 

diff --git a/runtime/src/iree/hal/drivers/cuda/native_executable.c b/runtime/src/iree/hal/drivers/cuda/native_executable.c
@@ -11,7 +11,7 @@
 #include "iree/base/api.h"
 #include "iree/base/tracing.h"
 #include "iree/hal/drivers/cuda/dynamic_symbols.h"
-#include "iree/hal/drivers/cuda/executable_layout.h"
+#include "iree/hal/drivers/cuda/pipeline_layout.h"
 #include "iree/hal/drivers/cuda/status_util.h"
 
 // flatcc schemas:

diff --git a/...iree/hal/drivers/cuda/executable_layout.c → ...c/iree/hal/drivers/cuda/pipeline_layout.c b/...iree/hal/drivers/cuda/executable_layout.c → ...c/iree/hal/drivers/cuda/pipeline_layout.c
@@ -4,7 +4,7 @@
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include "iree/hal/drivers/cuda/executable_layout.h"
+#include "iree/hal/drivers/cuda/pipeline_layout.h"
 
 #include <stddef.h>
 

diff --git a/...iree/hal/drivers/cuda/executable_layout.h → ...c/iree/hal/drivers/cuda/pipeline_layout.h b/...iree/hal/drivers/cuda/executable_layout.h → ...c/iree/hal/drivers/cuda/pipeline_layout.h
@@ -4,8 +4,8 @@
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifndef IREE_HAL_DRIVERS_CUDA_EXECUTABLE_LAYOUT_H_
-#define IREE_HAL_DRIVERS_CUDA_EXECUTABLE_LAYOUT_H_
+#ifndef IREE_HAL_DRIVERS_CUDA_PIPELINE_LAYOUT_H_
+#define IREE_HAL_DRIVERS_CUDA_PIPELINE_LAYOUT_H_
 
 #include "iree/base/api.h"
 #include "iree/hal/api.h"
@@ -59,4 +59,4 @@ iree_host_size_t iree_hal_cuda_executable_layout_num_constants(
 }  // extern "C"
 #endif  // __cplusplus
 
-#endif  // IREE_HAL_DRIVERS_CUDA_EXECUTABLE_LAYOUT_H_
+#endif  // IREE_HAL_DRIVERS_CUDA_PIPELINE_LAYOUT_H_
diff --git a/runtime/src/iree/hal/drivers/cuda/stream_command_buffer.c b/runtime/src/iree/hal/drivers/cuda/stream_command_buffer.c
@@ -9,8 +9,8 @@
 #include "iree/base/tracing.h"
 #include "iree/hal/drivers/cuda/cuda_buffer.h"
 #include "iree/hal/drivers/cuda/cuda_event.h"
-#include "iree/hal/drivers/cuda/executable_layout.h"
 #include "iree/hal/drivers/cuda/native_executable.h"
+#include "iree/hal/drivers/cuda/pipeline_layout.h"
 #include "iree/hal/drivers/cuda/status_util.h"
 
 #define IREE_HAL_CUDA_MAX_BINDING_COUNT 64

diff --git a/runtime/src/iree/hal/drivers/local_sync/sync_device.c b/runtime/src/iree/hal/drivers/local_sync/sync_device.c
@@ -16,7 +16,7 @@
 #include "iree/hal/drivers/local_sync/sync_semaphore.h"
 #include "iree/hal/local/inline_command_buffer.h"
 #include "iree/hal/local/local_executable_cache.h"
-#include "iree/hal/local/local_executable_layout.h"
+#include "iree/hal/local/local_pipeline_layout.h"
 #include "iree/hal/utils/buffer_transfer.h"
 #include "iree/hal/utils/deferred_command_buffer.h"
 

diff --git a/runtime/src/iree/hal/drivers/local_task/task_command_buffer.c b/runtime/src/iree/hal/drivers/local_task/task_command_buffer.c
@@ -16,7 +16,7 @@
 #include "iree/hal/local/executable_environment.h"
 #include "iree/hal/local/executable_library.h"
 #include "iree/hal/local/local_executable.h"
-#include "iree/hal/local/local_executable_layout.h"
+#include "iree/hal/local/local_pipeline_layout.h"
 #include "iree/hal/utils/resource_set.h"
 #include "iree/task/affinity_set.h"
 #include "iree/task/list.h"

diff --git a/runtime/src/iree/hal/drivers/local_task/task_device.c b/runtime/src/iree/hal/drivers/local_task/task_device.c
@@ -17,7 +17,7 @@
 #include "iree/hal/drivers/local_task/task_queue.h"
 #include "iree/hal/drivers/local_task/task_semaphore.h"
 #include "iree/hal/local/local_executable_cache.h"
-#include "iree/hal/local/local_executable_layout.h"
+#include "iree/hal/local/local_pipeline_layout.h"
 #include "iree/hal/utils/buffer_transfer.h"
 
 typedef struct iree_hal_task_device_t {

diff --git a/runtime/src/iree/hal/drivers/vulkan/BUILD b/runtime/src/iree/hal/drivers/vulkan/BUILD
@@ -40,8 +40,8 @@ iree_runtime_cc_library(
         "native_event.h",
         "native_executable.cc",
         "native_executable.h",
-        "native_executable_layout.cc",
-        "native_executable_layout.h",
+        "native_pipeline_layout.cc",
+        "native_pipeline_layout.h",
         "native_semaphore.cc",
         "native_semaphore.h",
         "nop_executable_cache.cc",

diff --git a/runtime/src/iree/hal/drivers/vulkan/CMakeLists.txt b/runtime/src/iree/hal/drivers/vulkan/CMakeLists.txt
@@ -41,8 +41,8 @@ iree_cc_library(
     "native_event.h"
     "native_executable.cc"
     "native_executable.h"
-    "native_executable_layout.cc"
-    "native_executable_layout.h"
+    "native_pipeline_layout.cc"
+    "native_pipeline_layout.h"
     "native_semaphore.cc"
     "native_semaphore.h"
     "nop_executable_cache.cc"

diff --git a/runtime/src/iree/hal/drivers/vulkan/builtin_executables.cc b/runtime/src/iree/hal/drivers/vulkan/builtin_executables.cc
@@ -10,7 +10,7 @@
 
 #include "iree/base/tracing.h"
 #include "iree/hal/drivers/vulkan/builtin/builtin_shaders_spv.h"
-#include "iree/hal/drivers/vulkan/native_executable_layout.h"
+#include "iree/hal/drivers/vulkan/native_pipeline_layout.h"
 #include "iree/hal/drivers/vulkan/status_util.h"
 
 namespace iree {