Skip to content

Commit b6b92ae

Browse files
Create GpgpuWalkerHelper class
Change-Id: Ia9aa7b816356aff57234b46ea3509b6bd9b7f14b
1 parent d51f2cd commit b6b92ae

34 files changed

+1217
-654
lines changed

runtime/command_queue/CMakeLists.txt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,6 @@ set(RUNTIME_SRCS_COMMAND_QUEUE
2525
${CMAKE_CURRENT_SOURCE_DIR}/command_queue_hw.h
2626
${CMAKE_CURRENT_SOURCE_DIR}/command_queue_hw.inl
2727
${CMAKE_CURRENT_SOURCE_DIR}/cpu_data_transfer_handler.cpp
28-
${CMAKE_CURRENT_SOURCE_DIR}/dispatch_walker.h
29-
${CMAKE_CURRENT_SOURCE_DIR}/dispatch_walker_helper.h
30-
${CMAKE_CURRENT_SOURCE_DIR}/dispatch_walker_helper.inl
3128
${CMAKE_CURRENT_SOURCE_DIR}/enqueue_barrier.h
3229
${CMAKE_CURRENT_SOURCE_DIR}/enqueue_common.h
3330
${CMAKE_CURRENT_SOURCE_DIR}/enqueue_copy_buffer.h
@@ -49,6 +46,8 @@ set(RUNTIME_SRCS_COMMAND_QUEUE
4946
${CMAKE_CURRENT_SOURCE_DIR}/enqueue_write_image.h
5047
${CMAKE_CURRENT_SOURCE_DIR}/finish.h
5148
${CMAKE_CURRENT_SOURCE_DIR}/flush.h
49+
${CMAKE_CURRENT_SOURCE_DIR}/gpgpu_walker.h
50+
${CMAKE_CURRENT_SOURCE_DIR}/gpgpu_walker.inl
5251
${CMAKE_CURRENT_SOURCE_DIR}/local_id_gen.cpp
5352
${CMAKE_CURRENT_SOURCE_DIR}/local_id_gen.h
5453
${CMAKE_CURRENT_SOURCE_DIR}/local_id_gen.inl

runtime/command_queue/command_queue_hw.inl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2017, Intel Corporation
2+
* Copyright (c) 2017 - 2018, Intel Corporation
33
*
44
* Permission is hereby granted, free of charge, to any person obtaining a
55
* copy of this software and associated documentation files (the "Software"),
@@ -20,7 +20,7 @@
2020
* OTHER DEALINGS IN THE SOFTWARE.
2121
*/
2222

23-
#include "runtime/command_queue/dispatch_walker.h"
23+
#include "runtime/command_queue/gpgpu_walker.h"
2424
#include "runtime/command_queue/enqueue_barrier.h"
2525
#include "runtime/command_queue/enqueue_copy_buffer.h"
2626
#include "runtime/command_queue/enqueue_copy_buffer_rect.h"

runtime/command_queue/dispatch_walker_helper.h

Lines changed: 0 additions & 56 deletions
This file was deleted.

runtime/command_queue/dispatch_walker_helper.inl

Lines changed: 0 additions & 99 deletions
This file was deleted.

runtime/command_queue/enqueue_common.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#include "runtime/builtin_kernels_simulation/scheduler_simulation.h"
2525
#include "hw_cmds.h"
2626
#include "runtime/command_queue/command_queue_hw.h"
27-
#include "runtime/command_queue/dispatch_walker.h"
27+
#include "runtime/command_queue/gpgpu_walker.h"
2828
#include "runtime/command_stream/command_stream_receiver.h"
2929
#include "runtime/event/event_builder.h"
3030
#include "runtime/gtpin/gtpin_notify.h"
@@ -243,7 +243,7 @@ void CommandQueueHw<GfxFamily>::enqueueHandler(Surface **surfacesForResidency,
243243
}
244244
}
245245

246-
dispatchWalker<GfxFamily>(
246+
GpgpuWalkerHelper<GfxFamily>::dispatchWalker(
247247
*this,
248248
multiDispatchInfo,
249249
numEventsInWaitList,
@@ -293,7 +293,7 @@ void CommandQueueHw<GfxFamily>::enqueueHandler(Surface **surfacesForResidency,
293293
this->getIndirectHeap(IndirectHeap::SURFACE_STATE).getGraphicsAllocation(),
294294
devQueueHw->getDebugQueue());
295295

296-
dispatchScheduler<GfxFamily>(
296+
GpgpuWalkerHelper<GfxFamily>::dispatchScheduler(
297297
*this,
298298
*devQueueHw,
299299
preemption,

runtime/command_queue/enqueue_kernel.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2017, Intel Corporation
2+
* Copyright (c) 2017 - 2018, Intel Corporation
33
*
44
* Permission is hereby granted, free of charge, to any person obtaining a
55
* copy of this software and associated documentation files (the "Software"),
@@ -24,7 +24,7 @@
2424
#include "hw_cmds.h"
2525
#include "runtime/command_queue/command_queue_hw.h"
2626
#include "runtime/command_stream/command_stream_receiver.h"
27-
#include "runtime/command_queue/dispatch_walker.h"
27+
#include "runtime/command_queue/gpgpu_walker.h"
2828
#include "runtime/helpers/kernel_commands.h"
2929
#include "runtime/helpers/task_information.h"
3030
#include "runtime/mem_obj/buffer.h"
@@ -69,7 +69,7 @@ struct EnqueueOperation<GfxFamily, CL_COMMAND_NDRANGE_KERNEL> {
6969
//user registers
7070
size += commandQueue.getPerfCountersUserRegistersNumber() * sizeof(typename GfxFamily::MI_STORE_REGISTER_MEM);
7171
}
72-
size += getSizeForWADisableLSQCROPERFforOCL<GfxFamily>(pKernel);
72+
size += GpgpuWalkerHelper<GfxFamily>::getSizeForWADisableLSQCROPERFforOCL(pKernel);
7373

7474
return size;
7575
}

runtime/command_queue/enqueue_marker.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2017, Intel Corporation
2+
* Copyright (c) 2017 - 2018, Intel Corporation
33
*
44
* Permission is hereby granted, free of charge, to any person obtaining a
55
* copy of this software and associated documentation files (the "Software"),
@@ -24,7 +24,7 @@
2424
#include "hw_cmds.h"
2525
#include "runtime/command_queue/command_queue_hw.h"
2626
#include "runtime/command_stream/command_stream_receiver.h"
27-
#include "runtime/command_queue/dispatch_walker.h"
27+
#include "runtime/command_queue/gpgpu_walker.h"
2828
#include "runtime/device/device.h"
2929
#include "runtime/event/event.h"
3030
#include "runtime/memory_manager/surface.h"

runtime/command_queue/enqueue_migrate_mem_objects.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2017, Intel Corporation
2+
* Copyright (c) 2017 - 2018, Intel Corporation
33
*
44
* Permission is hereby granted, free of charge, to any person obtaining a
55
* copy of this software and associated documentation files (the "Software"),
@@ -24,7 +24,7 @@
2424
#include "hw_cmds.h"
2525
#include "runtime/command_queue/command_queue_hw.h"
2626
#include "runtime/command_stream/command_stream_receiver.h"
27-
#include "runtime/command_queue/dispatch_walker.h"
27+
#include "runtime/command_queue/gpgpu_walker.h"
2828
#include "runtime/device/device.h"
2929
#include "runtime/event/event.h"
3030
#include "runtime/memory_manager/surface.h"

0 commit comments

Comments
 (0)