Skip to content

Commit b544b2d

Browse files
BartoszDunajskiCompute-Runtime-Automation
BartoszDunajski
authored and
Compute-Runtime-Automation
committed
Remove redundant CommandQueue member
Change-Id: I2ee338a3134cd81d6de7ecbed47c049dfbbae5aa Signed-off-by: Dunajski, Bartosz <bartosz.dunajski@intel.com>
1 parent 063df12 commit b544b2d

File tree

11 files changed

+28
-55
lines changed

11 files changed

+28
-55
lines changed

‎runtime/command_queue/command_queue.h‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -404,8 +404,6 @@ class CommandQueue : public BaseObject<_cl_command_queue> {
404404
return requiresCacheFlushAfterWalker;
405405
}
406406

407-
bool isMultiEngineQueue() const { return this->multiEngineQueue; }
408-
409407
void updateBcsTaskCount(uint32_t newBcsTaskCount) { this->bcsTaskCount = newBcsTaskCount; }
410408

411409
// taskCount of last task
@@ -464,7 +462,6 @@ class CommandQueue : public BaseObject<_cl_command_queue> {
464462

465463
bool isSpecialCommandQueue = false;
466464
bool requiresCacheFlushAfterWalker = false;
467-
bool multiEngineQueue = false;
468465

469466
std::unique_ptr<TimestampPacketContainer> timestampPacketContainer;
470467
};

‎runtime/command_queue/enqueue_common.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -746,7 +746,6 @@ CompletionStamp CommandQueueHw<GfxFamily>::enqueueNonBlocked(
746746
(QueuePriority::LOW == priority), //lowPriority
747747
implicitFlush, //implicitFlush
748748
!eventBuilder.getEvent() || getGpgpuCommandStreamReceiver().isNTo1SubmissionModelEnabled(), //outOfOrderExecutionAllowed
749-
this->multiEngineQueue, //multiEngineQueue
750749
false //epilogueRequired
751750
);
752751

@@ -940,7 +939,6 @@ CompletionStamp CommandQueueHw<GfxFamily>::enqueueCommandWithoutKernel(
940939
false, //lowPriority
941940
(enqueueProperties.operation == EnqueueProperties::Operation::Blit), //implicitFlush
942941
getGpgpuCommandStreamReceiver().isNTo1SubmissionModelEnabled(), //outOfOrderExecutionAllowed
943-
multiEngineQueue, //multiEngineQueue
944942
false //epilogueRequired
945943
);
946944

‎runtime/command_stream/csr_definitions.h‎

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -49,26 +49,25 @@ struct DispatchFlags {
4949
uint32_t l3CacheSettings, uint64_t sliceCount, bool blocking, bool dcFlush,
5050
bool useSLM, bool guardCommandBufferWithPipeControl, bool gsba32BitRequired,
5151
bool requiresCoherency, bool lowPriority, bool implicitFlush,
52-
bool outOfOrderExecutionAllowed, bool multiEngineQueue, bool epilogueRequired) : csrDependencies(csrDependencies),
53-
barrierTimestampPacketNodes(barrierTimestampPacketNodes),
54-
pipelineSelectArgs(pipelineSelectArgs),
55-
flushStampReference(flushStampReference),
56-
throttle(throttle),
57-
preemptionMode(preemptionMode),
58-
numGrfRequired(numGrfRequired),
59-
l3CacheSettings(l3CacheSettings),
60-
sliceCount(sliceCount),
61-
blocking(blocking),
62-
dcFlush(dcFlush),
63-
useSLM(useSLM),
64-
guardCommandBufferWithPipeControl(guardCommandBufferWithPipeControl),
65-
gsba32BitRequired(gsba32BitRequired),
66-
requiresCoherency(requiresCoherency),
67-
lowPriority(lowPriority),
68-
implicitFlush(implicitFlush),
69-
outOfOrderExecutionAllowed(outOfOrderExecutionAllowed),
70-
multiEngineQueue(multiEngineQueue),
71-
epilogueRequired(epilogueRequired){};
52+
bool outOfOrderExecutionAllowed, bool epilogueRequired) : csrDependencies(csrDependencies),
53+
barrierTimestampPacketNodes(barrierTimestampPacketNodes),
54+
pipelineSelectArgs(pipelineSelectArgs),
55+
flushStampReference(flushStampReference),
56+
throttle(throttle),
57+
preemptionMode(preemptionMode),
58+
numGrfRequired(numGrfRequired),
59+
l3CacheSettings(l3CacheSettings),
60+
sliceCount(sliceCount),
61+
blocking(blocking),
62+
dcFlush(dcFlush),
63+
useSLM(useSLM),
64+
guardCommandBufferWithPipeControl(guardCommandBufferWithPipeControl),
65+
gsba32BitRequired(gsba32BitRequired),
66+
requiresCoherency(requiresCoherency),
67+
lowPriority(lowPriority),
68+
implicitFlush(implicitFlush),
69+
outOfOrderExecutionAllowed(outOfOrderExecutionAllowed),
70+
epilogueRequired(epilogueRequired){};
7271
CsrDependencies csrDependencies;
7372
TimestampPacketContainer *barrierTimestampPacketNodes = nullptr;
7473
PipelineSelectArgs pipelineSelectArgs;
@@ -88,7 +87,6 @@ struct DispatchFlags {
8887
bool lowPriority = false;
8988
bool implicitFlush = false;
9089
bool outOfOrderExecutionAllowed = false;
91-
bool multiEngineQueue = false;
9290
bool epilogueRequired = false;
9391
};
9492

‎runtime/helpers/task_information.cpp‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ CompletionStamp &CommandMapUnmap::submit(uint32_t taskLevel, bool terminated) {
6868
commandQueue.getPriority() == QueuePriority::LOW, //lowPriority
6969
false, //implicitFlush
7070
commandQueue.getGpgpuCommandStreamReceiver().isNTo1SubmissionModelEnabled(), //outOfOrderExecutionAllowed
71-
commandQueue.isMultiEngineQueue(), //multiEngineQueue
7271
false //epilogueRequired
7372
);
7473

@@ -223,7 +222,6 @@ CompletionStamp &CommandComputeKernel::submit(uint32_t taskLevel, bool terminate
223222
commandQueue.getPriority() == QueuePriority::LOW, //lowPriority
224223
false, //implicitFlush
225224
commandQueue.getGpgpuCommandStreamReceiver().isNTo1SubmissionModelEnabled(), //outOfOrderExecutionAllowed
226-
commandQueue.isMultiEngineQueue(), //multiEngineQueue
227225
false //epilogueRequired
228226
);
229227

@@ -328,7 +326,6 @@ CompletionStamp &CommandWithoutKernel::submit(uint32_t taskLevel, bool terminate
328326
commandQueue.getPriority() == QueuePriority::LOW, //lowPriority
329327
false, //implicitFlush
330328
commandStreamReceiver.isNTo1SubmissionModelEnabled(), //outOfOrderExecutionAllowed
331-
commandQueue.isMultiEngineQueue(), //multiEngineQueue
332329
false //epilogueRequired
333330
);
334331

‎unit_tests/command_queue/command_queue_tests.cpp‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,7 @@ HWTEST_F(CommandQueueCommandStreamTest, givenMultiDispatchInfoWithSingleKernelWi
433433
DebugManager.flags.EnableCacheFlushAfterWalker.set(0);
434434

435435
MockCommandQueueHw<FamilyType> cmdQ(context.get(), pDevice, nullptr);
436-
cmdQ.multiEngineQueue = true;
436+
pDevice->getUltCommandStreamReceiver<FamilyType>().multiOsContextCapable = true;
437437
MockKernelWithInternals mockKernelWithInternals(*pDevice, context.get());
438438

439439
mockKernelWithInternals.mockKernel->kernelArgRequiresCacheFlush.resize(1);
@@ -1058,14 +1058,6 @@ TEST(CommandQueueDestructorTest, whenCommandQueueIsDestroyedThenDestroysTimestam
10581058
EXPECT_EQ(1, context->getRefInternalCount());
10591059
}
10601060

1061-
TEST(CommandQueuePropertiesTests, whenDefaultCommandQueueIsCreatedThenItIsNotMultiEngineQueue) {
1062-
MockCommandQueue queue;
1063-
EXPECT_FALSE(queue.multiEngineQueue);
1064-
EXPECT_FALSE(queue.isMultiEngineQueue());
1065-
queue.multiEngineQueue = true;
1066-
EXPECT_TRUE(queue.isMultiEngineQueue());
1067-
}
1068-
10691061
TEST(CommandQueuePropertiesTests, whenGetEngineIsCalledThenQueueEngineIsReturned) {
10701062
MockCommandQueue queue;
10711063
EngineControl engineControl;

‎unit_tests/command_queue/enqueue_command_without_kernel_tests.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,6 @@ HWTEST_F(DispatchFlagsTests, whenEnqueueCommandWithoutKernelThenPassCorrectDispa
126126
EXPECT_EQ(blocking, mockCsr->passedDispatchFlags.blocking);
127127
EXPECT_FALSE(mockCsr->passedDispatchFlags.implicitFlush);
128128
EXPECT_TRUE(mockCsr->passedDispatchFlags.guardCommandBufferWithPipeControl);
129-
EXPECT_EQ(mockCmdQ->isMultiEngineQueue(), mockCsr->passedDispatchFlags.multiEngineQueue);
130129
EXPECT_EQ(device->getPreemptionMode(), mockCsr->passedDispatchFlags.preemptionMode);
131130
EXPECT_EQ(mockCmdQ->flushStamp->getStampReference(), mockCsr->passedDispatchFlags.flushStampReference);
132131
}

‎unit_tests/command_stream/compute_mode_tests.h‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ using namespace NEO;
1616

1717
struct ComputeModeRequirements : public ::testing::Test {
1818
template <typename FamilyType>
19-
struct myCsr : public CommandStreamReceiverHw<FamilyType> {
19+
struct myCsr : public UltCommandStreamReceiver<FamilyType> {
2020
using CommandStreamReceiver::commandStream;
2121
using CommandStreamReceiverHw<FamilyType>::requiredThreadArbitrationPolicy;
2222
using CommandStreamReceiverHw<FamilyType>::lastSentThreadArbitrationPolicy;
23-
myCsr(ExecutionEnvironment &executionEnvironment) : CommandStreamReceiverHw<FamilyType>(executionEnvironment, 0){};
23+
myCsr(ExecutionEnvironment &executionEnvironment) : UltCommandStreamReceiver<FamilyType>(executionEnvironment, 0){};
2424
CsrSizeRequestFlags *getCsrRequestFlags() { return &this->csrSizeRequestFlags; }
2525
};
2626
void makeResidentSharedAlloc() {
@@ -29,12 +29,12 @@ struct ComputeModeRequirements : public ::testing::Test {
2929

3030
template <typename FamilyType>
3131
void overrideComputeModeRequest(bool reqestChanged, bool requireCoherency, bool hasSharedHandles) {
32-
overrideComputeModeRequest<FamilyType>(reqestChanged, requireCoherency, hasSharedHandles, false, 128u, false);
32+
overrideComputeModeRequest<FamilyType>(reqestChanged, requireCoherency, hasSharedHandles, false, 128u);
3333
}
3434

3535
template <typename FamilyType>
3636
void overrideComputeModeRequest(bool reqestChanged, bool requireCoherency, bool hasSharedHandles, bool modifyThreadArbitrationPolicy) {
37-
overrideComputeModeRequest<FamilyType>(reqestChanged, requireCoherency, hasSharedHandles, false, 128u, false);
37+
overrideComputeModeRequest<FamilyType>(reqestChanged, requireCoherency, hasSharedHandles, false, 128u);
3838
if (modifyThreadArbitrationPolicy) {
3939
getCsrHw<FamilyType>()->lastSentThreadArbitrationPolicy = getCsrHw<FamilyType>()->requiredThreadArbitrationPolicy;
4040
}
@@ -45,15 +45,13 @@ struct ComputeModeRequirements : public ::testing::Test {
4545
bool requireCoherency,
4646
bool hasSharedHandles,
4747
bool numGrfRequiredChanged,
48-
uint32_t numGrfRequired,
49-
bool multiEngineQueue) {
48+
uint32_t numGrfRequired) {
5049
auto csrHw = getCsrHw<FamilyType>();
5150
csrHw->getCsrRequestFlags()->coherencyRequestChanged = coherencyRequestChanged;
5251
csrHw->getCsrRequestFlags()->hasSharedHandles = hasSharedHandles;
5352
csrHw->getCsrRequestFlags()->numGrfRequiredChanged = numGrfRequiredChanged;
5453
flags.requiresCoherency = requireCoherency;
5554
flags.numGrfRequired = numGrfRequired;
56-
flags.multiEngineQueue = multiEngineQueue;
5755
if (hasSharedHandles) {
5856
makeResidentSharedAlloc();
5957
}
@@ -80,6 +78,6 @@ struct ComputeModeRequirements : public ::testing::Test {
8078

8179
CommandStreamReceiver *csr = nullptr;
8280
std::unique_ptr<MockDevice> device;
83-
DispatchFlags flags{{}, nullptr, {}, nullptr, QueueThrottle::MEDIUM, PreemptionMode::Disabled, GrfConfig::DefaultGrfNumber, L3CachingSettings::l3CacheOn, QueueSliceCount::defaultSliceCount, false, false, false, false, false, false, false, false, false, false, false};
81+
DispatchFlags flags{{}, nullptr, {}, nullptr, QueueThrottle::MEDIUM, PreemptionMode::Disabled, GrfConfig::DefaultGrfNumber, L3CachingSettings::l3CacheOn, QueueSliceCount::defaultSliceCount, false, false, false, false, false, false, false, false, false, false};
8482
GraphicsAllocation *alloc = nullptr;
8583
};

‎unit_tests/gen12lp/compute_mode_tests_gen12lp.inl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ TGLLPTEST_F(ComputeModeRequirements, givenCsrRequestFlagsWithSharedHandlesWhenCo
4848
EXPECT_EQ(cmdsSize, stream.getUsed());
4949

5050
stream.replaceBuffer(buff, 1024);
51-
overrideComputeModeRequest<FamilyType>(false, false, true, true, 127u, false);
51+
overrideComputeModeRequest<FamilyType>(false, false, true, true, 127u);
5252

5353
retSize = getCsrHw<FamilyType>()->getCmdSizeForComputeMode();
5454
EXPECT_EQ(cmdsSize, retSize);
@@ -88,7 +88,7 @@ TGLLPTEST_F(ComputeModeRequirements, givenCsrRequestFlagsWithoutSharedHandlesWhe
8888
EXPECT_EQ(cmdsSize, stream.getUsed());
8989

9090
stream.replaceBuffer(buff, 1024);
91-
overrideComputeModeRequest<FamilyType>(false, false, false, true, 127u, false);
91+
overrideComputeModeRequest<FamilyType>(false, false, false, true, 127u);
9292

9393
retSize = getCsrHw<FamilyType>()->getCmdSizeForComputeMode();
9494
EXPECT_EQ(cmdsSize, retSize);

‎unit_tests/helpers/dispatch_flags_helper.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ struct DispatchFlagsHelper {
3131
false, //lowPriority
3232
false, //implicitFlush
3333
false, //outOfOrderExecutionAllowed
34-
false, //multiEngineQueue
3534
false //epilogueRequired
3635
);
3736
}

‎unit_tests/helpers/task_information_tests.cpp‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,6 @@ HWTEST_F(DispatchFlagsTests, givenCommandMapUnmapWhenSubmitThenPassCorrectDispat
199199
EXPECT_EQ(mockCmdQ->getPriority() == QueuePriority::LOW, mockCsr->passedDispatchFlags.lowPriority);
200200
EXPECT_FALSE(mockCsr->passedDispatchFlags.implicitFlush);
201201
EXPECT_EQ(mockCmdQ->getGpgpuCommandStreamReceiver().isNTo1SubmissionModelEnabled(), mockCsr->passedDispatchFlags.outOfOrderExecutionAllowed);
202-
EXPECT_EQ(mockCmdQ->isMultiEngineQueue(), mockCsr->passedDispatchFlags.multiEngineQueue);
203202
EXPECT_FALSE(mockCsr->passedDispatchFlags.epilogueRequired);
204203
}
205204

@@ -248,7 +247,6 @@ HWTEST_F(DispatchFlagsTests, givenCommandComputeKernelWhenSubmitThenPassCorrectD
248247
EXPECT_EQ(mockCmdQ->getPriority() == QueuePriority::LOW, mockCsr->passedDispatchFlags.lowPriority);
249248
EXPECT_FALSE(mockCsr->passedDispatchFlags.implicitFlush);
250249
EXPECT_EQ(mockCmdQ->getGpgpuCommandStreamReceiver().isNTo1SubmissionModelEnabled(), mockCsr->passedDispatchFlags.outOfOrderExecutionAllowed);
251-
EXPECT_EQ(mockCmdQ->isMultiEngineQueue(), mockCsr->passedDispatchFlags.multiEngineQueue);
252250
EXPECT_FALSE(mockCsr->passedDispatchFlags.epilogueRequired);
253251
}
254252

@@ -289,7 +287,6 @@ HWTEST_F(DispatchFlagsTests, givenCommandWithoutKernelWhenSubmitThenPassCorrectD
289287
EXPECT_EQ(mockCmdQ->getPriority() == QueuePriority::LOW, mockCsr->passedDispatchFlags.lowPriority);
290288
EXPECT_FALSE(mockCsr->passedDispatchFlags.implicitFlush);
291289
EXPECT_EQ(mockCmdQ->getGpgpuCommandStreamReceiver().isNTo1SubmissionModelEnabled(), mockCsr->passedDispatchFlags.outOfOrderExecutionAllowed);
292-
EXPECT_EQ(mockCmdQ->isMultiEngineQueue(), mockCsr->passedDispatchFlags.multiEngineQueue);
293290
EXPECT_FALSE(mockCsr->passedDispatchFlags.epilogueRequired);
294291
}
295292

0 commit comments

Comments
 (0)