jasder
/
antlr
1
0
Fork 1
Code Issues Pull Requests Releases 1 Wiki Activity

Track token count separately for each pass

This commit is contained in:
Sam Harwell 2013-04-30 21:35:10 -05:00
parent eb9eb17aa2
commit 646f673d84
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tool/test/org/antlr/v4/test/TestPerformance.java
View File

@ -97,6 +97,7 @@ import java.util.concurrent.Future;
import java.util.concurrent.ThreadFactory; import java.util.concurrent.ThreadFactory;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicIntegerArray;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import java.util.zip.CRC32; import java.util.zip.CRC32;
@ -302,7 +303,7 @@ public class TestPerformance extends BaseTest {
private static final ParseTreeListener[] sharedListeners = new ParseTreeListener[NUMBER_OF_THREADS]; private static final ParseTreeListener[] sharedListeners = new ParseTreeListener[NUMBER_OF_THREADS];
private final AtomicInteger tokenCount = new AtomicInteger(); private final AtomicIntegerArray tokenCount = new AtomicIntegerArray(PASSES);
private int currentPass; private int currentPass;
@Test @Test
@ -475,7 +476,7 @@ public class TestPerformance extends BaseTest {
@SuppressWarnings("unused") @SuppressWarnings("unused")
protected void parseSources(final ParserFactory factory, Collection<InputDescriptor> sources) throws InterruptedException { protected void parseSources(final ParserFactory factory, Collection<InputDescriptor> sources) throws InterruptedException {
long startTime = System.currentTimeMillis(); long startTime = System.currentTimeMillis();
tokenCount.set(0); tokenCount.set(currentPass, 0);
int inputSize = 0; int inputSize = 0;
int inputCount = 0; int inputCount = 0;
@ -531,7 +532,7 @@ public class TestPerformance extends BaseTest {
System.out.format("Total parse time for %d files (%d KB, %d tokens, checksum 0x%8X): %dms%n", System.out.format("Total parse time for %d files (%d KB, %d tokens, checksum 0x%8X): %dms%n",
inputCount, inputCount,
inputSize / 1024, inputSize / 1024,
tokenCount.get(), tokenCount.get(currentPass),
COMPUTE_CHECKSUM ? checksum.getValue() : 0, COMPUTE_CHECKSUM ? checksum.getValue() : 0,
System.currentTimeMillis() - startTime); System.currentTimeMillis() - startTime);
@ -769,7 +770,7 @@ public class TestPerformance extends BaseTest {
CommonTokenStream tokens = new CommonTokenStream(lexer); CommonTokenStream tokens = new CommonTokenStream(lexer);
tokens.fill(); tokens.fill();
tokenCount.addAndGet(tokens.size()); tokenCount.addAndGet(currentPass, tokens.size());
if (COMPUTE_CHECKSUM) { if (COMPUTE_CHECKSUM) {
for (Token token : tokens.getTokens()) { for (Token token : tokens.getTokens()) {