Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(504)

Side by Side Diff: gpu/command_buffer/service/sync_point_manager_unittest.cc

Issue 1568563002: Added a way for sync point clients to issue out of order waits. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Allow WaitOutOfOrder if no client order data Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2015 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <stdint.h> 5 #include <stdint.h>
6 6
7 #include <queue> 7 #include <queue>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "gpu/command_buffer/service/sync_point_manager.h" 10 #include "gpu/command_buffer/service/sync_point_manager.h"
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 EXPECT_EQ(1u, order_num); 78 EXPECT_EQ(1u, order_num);
79 79
80 EXPECT_EQ(0u, order_data->current_order_num()); 80 EXPECT_EQ(0u, order_data->current_order_num());
81 EXPECT_EQ(0u, order_data->processed_order_num()); 81 EXPECT_EQ(0u, order_data->processed_order_num());
82 EXPECT_EQ(order_num, order_data->unprocessed_order_num()); 82 EXPECT_EQ(order_num, order_data->unprocessed_order_num());
83 83
84 order_data->BeginProcessingOrderNumber(order_num); 84 order_data->BeginProcessingOrderNumber(order_num);
85 EXPECT_EQ(order_num, order_data->current_order_num()); 85 EXPECT_EQ(order_num, order_data->current_order_num());
86 EXPECT_EQ(0u, order_data->processed_order_num()); 86 EXPECT_EQ(0u, order_data->processed_order_num());
87 EXPECT_EQ(order_num, order_data->unprocessed_order_num()); 87 EXPECT_EQ(order_num, order_data->unprocessed_order_num());
88 EXPECT_TRUE(order_data->IsProcessingOrderNumber());
89
90 order_data->PauseProcessingOrderNumber(order_num);
91 EXPECT_FALSE(order_data->IsProcessingOrderNumber());
92
93 order_data->BeginProcessingOrderNumber(order_num);
94 EXPECT_TRUE(order_data->IsProcessingOrderNumber());
88 95
89 order_data->FinishProcessingOrderNumber(order_num); 96 order_data->FinishProcessingOrderNumber(order_num);
90 EXPECT_EQ(order_num, order_data->current_order_num()); 97 EXPECT_EQ(order_num, order_data->current_order_num());
91 EXPECT_EQ(order_num, order_data->processed_order_num()); 98 EXPECT_EQ(order_num, order_data->processed_order_num());
92 EXPECT_EQ(order_num, order_data->unprocessed_order_num()); 99 EXPECT_EQ(order_num, order_data->unprocessed_order_num());
100 EXPECT_FALSE(order_data->IsProcessingOrderNumber());
93 } 101 }
94 102
95 TEST_F(SyncPointManagerTest, SyncPointClientRegistration) { 103 TEST_F(SyncPointManagerTest, SyncPointClientRegistration) {
96 const CommandBufferNamespace kNamespaceId = 104 const CommandBufferNamespace kNamespaceId =
97 gpu::CommandBufferNamespace::GPU_IO; 105 gpu::CommandBufferNamespace::GPU_IO;
98 const uint64_t kBufferId = 0x123; 106 const uint64_t kBufferId = 0x123;
99 107
100 scoped_refptr<SyncPointClientState> empty_state = 108 scoped_refptr<SyncPointClientState> empty_state =
101 sync_point_manager_->GetSyncPointClientState(kNamespaceId, kBufferId); 109 sync_point_manager_->GetSyncPointClientState(kNamespaceId, kBufferId);
102 EXPECT_FALSE(empty_state); 110 EXPECT_FALSE(empty_state);
(...skipping 17 matching lines...) Expand all
120 128
121 scoped_refptr<SyncPointOrderData> order_data = SyncPointOrderData::Create(); 129 scoped_refptr<SyncPointOrderData> order_data = SyncPointOrderData::Create();
122 scoped_ptr<SyncPointClient> client = 130 scoped_ptr<SyncPointClient> client =
123 sync_point_manager_->CreateSyncPointClient(order_data, kNamespaceId, 131 sync_point_manager_->CreateSyncPointClient(order_data, kNamespaceId,
124 kBufferId); 132 kBufferId);
125 scoped_refptr<SyncPointClientState> client_state = client->client_state(); 133 scoped_refptr<SyncPointClientState> client_state = client->client_state();
126 134
127 EXPECT_EQ(0u, client_state->fence_sync_release()); 135 EXPECT_EQ(0u, client_state->fence_sync_release());
128 EXPECT_FALSE(client_state->IsFenceSyncReleased(1)); 136 EXPECT_FALSE(client_state->IsFenceSyncReleased(1));
129 137
138 const uint32_t order_num =
139 order_data->GenerateUnprocessedOrderNumber(sync_point_manager_.get());
140 order_data->BeginProcessingOrderNumber(order_num);
130 client->ReleaseFenceSync(1); 141 client->ReleaseFenceSync(1);
142 order_data->FinishProcessingOrderNumber(order_num);
131 143
132 EXPECT_EQ(1u, client_state->fence_sync_release()); 144 EXPECT_EQ(1u, client_state->fence_sync_release());
133 EXPECT_TRUE(client_state->IsFenceSyncReleased(1)); 145 EXPECT_TRUE(client_state->IsFenceSyncReleased(1));
134 } 146 }
135 147
136 TEST_F(SyncPointManagerTest, MultipleClientsPerOrderData) { 148 TEST_F(SyncPointManagerTest, MultipleClientsPerOrderData) {
137 const CommandBufferNamespace kNamespaceId = 149 const CommandBufferNamespace kNamespaceId =
138 gpu::CommandBufferNamespace::GPU_IO; 150 gpu::CommandBufferNamespace::GPU_IO;
139 const uint64_t kBufferId1 = 0x123; 151 const uint64_t kBufferId1 = 0x123;
140 const uint64_t kBufferId2 = 0x234; 152 const uint64_t kBufferId2 = 0x234;
141 153
142 scoped_refptr<SyncPointOrderData> order_data = SyncPointOrderData::Create(); 154 scoped_refptr<SyncPointOrderData> order_data = SyncPointOrderData::Create();
143 scoped_ptr<SyncPointClient> client1 = 155 scoped_ptr<SyncPointClient> client1 =
144 sync_point_manager_->CreateSyncPointClient(order_data, kNamespaceId, 156 sync_point_manager_->CreateSyncPointClient(order_data, kNamespaceId,
145 kBufferId1); 157 kBufferId1);
146 scoped_ptr<SyncPointClient> client2 = 158 scoped_ptr<SyncPointClient> client2 =
147 sync_point_manager_->CreateSyncPointClient(order_data, kNamespaceId, 159 sync_point_manager_->CreateSyncPointClient(order_data, kNamespaceId,
148 kBufferId2); 160 kBufferId2);
149 161
150 scoped_refptr<SyncPointClientState> client_state1 = client1->client_state(); 162 scoped_refptr<SyncPointClientState> client_state1 = client1->client_state();
151 scoped_refptr<SyncPointClientState> client_state2 = client2->client_state(); 163 scoped_refptr<SyncPointClientState> client_state2 = client2->client_state();
152 164
165 const uint32_t order_num =
166 order_data->GenerateUnprocessedOrderNumber(sync_point_manager_.get());
167 order_data->BeginProcessingOrderNumber(order_num);
153 client1->ReleaseFenceSync(1); 168 client1->ReleaseFenceSync(1);
169 order_data->FinishProcessingOrderNumber(order_num);
154 170
155 EXPECT_TRUE(client_state1->IsFenceSyncReleased(1)); 171 EXPECT_TRUE(client_state1->IsFenceSyncReleased(1));
156 EXPECT_FALSE(client_state2->IsFenceSyncReleased(1)); 172 EXPECT_FALSE(client_state2->IsFenceSyncReleased(1));
157 } 173 }
158 174
159 TEST_F(SyncPointManagerTest, BasicFenceSyncWaitRelease) { 175 TEST_F(SyncPointManagerTest, BasicFenceSyncWaitRelease) {
160 const CommandBufferNamespace kNamespaceId = 176 const CommandBufferNamespace kNamespaceId =
161 gpu::CommandBufferNamespace::GPU_IO; 177 gpu::CommandBufferNamespace::GPU_IO;
162 const uint64_t kBufferId1 = 0x123; 178 const uint64_t kBufferId1 = 0x123;
163 const uint64_t kBufferId2 = 0x234; 179 const uint64_t kBufferId2 = 0x234;
(...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after
408 EXPECT_EQ(10, test_num); 424 EXPECT_EQ(10, test_num);
409 425
410 // Beginning order [4] should immediately trigger the release. 426 // Beginning order [4] should immediately trigger the release.
411 release_stream.BeginProcessing(); 427 release_stream.BeginProcessing();
412 ASSERT_EQ(4u, release_stream.order_data->current_order_num()); 428 ASSERT_EQ(4u, release_stream.order_data->current_order_num());
413 EXPECT_TRUE(release_stream.client->client_state()->IsFenceSyncReleased(1)); 429 EXPECT_TRUE(release_stream.client->client_state()->IsFenceSyncReleased(1));
414 EXPECT_EQ(123, test_num); 430 EXPECT_EQ(123, test_num);
415 } 431 }
416 432
417 } // namespace gpu 433 } // namespace gpu
OLDNEW
« no previous file with comments | « gpu/command_buffer/service/sync_point_manager.cc ('k') | gpu/command_buffer/tests/gl_fence_sync_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698