Merge "Fix ByteBufferBulkPerfTest issues by shortening param & test names." am: 5c73e446de am: 29267e1b30 am: b991caa231

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2128773

Change-Id: I73ac0f4f830c2582d5af66948042ecf21eb1f9f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Miguel Aranda
2022-06-20 15:04:14 +00:00
committed by Automerger Merge Worker

View File

@@ -36,10 +36,10 @@ import java.util.Collection;
@RunWith(Parameterized.class) @RunWith(Parameterized.class)
@LargeTest @LargeTest
public class ByteBufferBulkPerfTest { public class BulkPerfTest {
@Rule public PerfStatusReporter mPerfStatusReporter = new PerfStatusReporter(); @Rule public PerfStatusReporter mPerfStatusReporter = new PerfStatusReporter();
@Parameters(name = "mAligned({0}), mSrcBufferType({1}), mDataBufferType({2}), mBufferSize({3})") @Parameters(name = "mAlign({0}), mSBuf({1}), mDBuf({2}), mSize({3})")
public static Collection<Object[]> data() { public static Collection<Object[]> data() {
return Arrays.asList( return Arrays.asList(
new Object[][] { new Object[][] {
@@ -83,7 +83,7 @@ public class ByteBufferBulkPerfTest {
} }
@Parameterized.Parameter(0) @Parameterized.Parameter(0)
public boolean mAligned; public boolean mAlign;
enum MyBufferType { enum MyBufferType {
DIRECT, DIRECT,
@@ -92,13 +92,13 @@ public class ByteBufferBulkPerfTest {
} }
@Parameterized.Parameter(1) @Parameterized.Parameter(1)
public MyBufferType mSrcBufferType; public MyBufferType mSBuf;
@Parameterized.Parameter(2) @Parameterized.Parameter(2)
public MyBufferType mDataBufferType; public MyBufferType mDBuf;
@Parameterized.Parameter(3) @Parameterized.Parameter(3)
public int mBufferSize; public int mSize;
public static ByteBuffer newBuffer(boolean aligned, MyBufferType bufferType, int bsize) public static ByteBuffer newBuffer(boolean aligned, MyBufferType bufferType, int bsize)
throws IOException { throws IOException {
@@ -126,13 +126,13 @@ public class ByteBufferBulkPerfTest {
} }
@Test @Test
public void timeByteBuffer_putByteBuffer() throws Exception { public void timePut() throws Exception {
ByteBuffer src = ByteBufferBulkPerfTest.newBuffer(mAligned, mSrcBufferType, mBufferSize); ByteBuffer src = BulkPerfTest.newBuffer(mAlign, mSBuf, mSize);
ByteBuffer data = ByteBufferBulkPerfTest.newBuffer(mAligned, mDataBufferType, mBufferSize); ByteBuffer data = BulkPerfTest.newBuffer(mAlign, mDBuf, mSize);
BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); BenchmarkState state = mPerfStatusReporter.getBenchmarkState();
while (state.keepRunning()) { while (state.keepRunning()) {
src.position(mAligned ? 0 : 1); src.position(mAlign ? 0 : 1);
data.position(mAligned ? 0 : 1); data.position(mAlign ? 0 : 1);
src.put(data); src.put(data);
} }
} }