Adds an -XcompilerMetrics flag to the compiler. This will
create a compilerMetrics.xml file that contains information
about the build, such as the list of incoming java classes,
the list of types that were generated by the compiler,
and details about wall clock time of different steps.
Review at http://gwt-code-reviews.appspot.com/1045801
git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@9155 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/dev/core/src/com/google/gwt/core/ext/linker/CompilationMetricsArtifact.java b/dev/core/src/com/google/gwt/core/ext/linker/CompilationMetricsArtifact.java
new file mode 100644
index 0000000..ab467dd
--- /dev/null
+++ b/dev/core/src/com/google/gwt/core/ext/linker/CompilationMetricsArtifact.java
@@ -0,0 +1,133 @@
+/*
+ * Copyright 2010 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package com.google.gwt.core.ext.linker;
+
+import com.google.gwt.core.ext.Linker;
+import com.google.gwt.core.linker.SoycReportLinker;
+import com.google.gwt.dev.js.SizeBreakdown;
+
+/**
+ * Captures some metrics from the compile permutations step of the build.
+ */
+@Transferable
+public class CompilationMetricsArtifact extends Artifact<CompilationMetricsArtifact> {
+
+ private long compileElapsedMilliseconds;
+ private long elapsedMilliseconds;
+ private final int permutationId;
+ private String permutationDescription;
+ private int[] jsSize;
+
+ public CompilationMetricsArtifact(int permutationId) {
+ this(SoycReportLinker.class, permutationId);
+ }
+
+ protected CompilationMetricsArtifact(Class<? extends Linker> linker, int permutationId) {
+ super(linker);
+ this.permutationId = permutationId;
+ }
+
+ /**
+ * @return wall clock time elapsed since start of compilation
+ */
+ public long getCompileElapsedMilliseconds() {
+ return compileElapsedMilliseconds;
+ }
+
+ /**
+ * @return wall clock time elapsed since start of execution
+ */
+ public long getElapsedMilliseconds() {
+ return elapsedMilliseconds;
+ }
+
+ /**
+ * @return a map containing the name of the JavaScript fragments and their
+ * sizes.
+ */
+ public int[] getJsSize() {
+ return this.jsSize;
+ }
+
+ /**
+ * @return the permutation id associated with compiling this permutation.
+ */
+ public int getPermuationId() {
+ return permutationId;
+ }
+
+ /**
+ * @return human readable description of the permutation
+ */
+ public String getPermutationDescription() {
+ return permutationDescription;
+ }
+
+ @Override
+ public int hashCode() {
+ return getName().hashCode();
+ }
+
+ /**
+ * @param compileElapsedMilliseconds wall clock time elapsed since start of
+ * compilation
+ */
+ public CompilationMetricsArtifact setCompileElapsedMilliseconds(long compileElapsedMilliseconds) {
+ this.compileElapsedMilliseconds = compileElapsedMilliseconds;
+ return this;
+ }
+
+ /**
+ * @param elapsedMilliseconds wall clock time elapsed since JVM startup
+ */
+ public CompilationMetricsArtifact setElapsedMilliseconds(long elapsedMilliseconds) {
+ this.elapsedMilliseconds = elapsedMilliseconds;
+ return this;
+ }
+
+ /**
+ * @param sizeBreakdowns breakdown of sizes in JavaScript fragments
+ */
+ public void setJsSize(SizeBreakdown[] sizeBreakdowns) {
+ this.jsSize = new int[sizeBreakdowns.length];
+ for (int i = 0; i < sizeBreakdowns.length; ++i) {
+ this.jsSize[i] = sizeBreakdowns[i].getSize();
+ }
+ }
+
+ /**
+ * @param permutationDescription human readable description of the permutation
+ */
+ public CompilationMetricsArtifact setPermutationDescription(String permutationDescription) {
+ this.permutationDescription = permutationDescription;
+ return this;
+ }
+
+ @Override
+ protected int compareToComparableArtifact(CompilationMetricsArtifact o) {
+ return getName().compareTo(o.getName());
+ }
+
+ @Override
+ protected final Class<CompilationMetricsArtifact> getComparableArtifactType() {
+ return CompilationMetricsArtifact.class;
+ }
+
+ private String getName() {
+ return "CompilationMetricsArtifact-" + permutationId;
+ }
+}
diff --git a/dev/core/src/com/google/gwt/core/ext/linker/ModuleMetricsArtifact.java b/dev/core/src/com/google/gwt/core/ext/linker/ModuleMetricsArtifact.java
new file mode 100644
index 0000000..ba325f2
--- /dev/null
+++ b/dev/core/src/com/google/gwt/core/ext/linker/ModuleMetricsArtifact.java
@@ -0,0 +1,122 @@
+/*
+ * Copyright 2010 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package com.google.gwt.core.ext.linker;
+
+import com.google.gwt.core.ext.Linker;
+import com.google.gwt.core.linker.SoycReportLinker;
+
+import java.util.Collection;
+import java.util.concurrent.atomic.AtomicInteger;
+
+/**
+ * Captures some metrics from the module load and initial type oracle compile
+ * step.
+ */
+@Transferable
+public class ModuleMetricsArtifact extends Artifact<ModuleMetricsArtifact> {
+ /*
+ * In an ideal world, there should be only one of these module instances, but
+ * since this information is recomputed for each precompile task, there will
+ * be multiple entries which are all about the same.
+ */
+ private static AtomicInteger nextInstance = new AtomicInteger(0);
+
+ private final int instanceId;
+ private long elapsedMilliseconds;
+ private String[] sourceFiles;
+ private String[] initialTypes;
+
+ public ModuleMetricsArtifact() {
+ this(SoycReportLinker.class, nextInstance.getAndIncrement());
+ }
+
+ protected ModuleMetricsArtifact(Class<? extends Linker> linker, int instanceId) {
+ super(linker);
+ this.instanceId = instanceId;
+ }
+
+ /**
+ * @return wall clock time elapsed since start of module load to end of the
+ * initial type oracle build.
+ */
+ public long getElapsedMilliseconds() {
+ return elapsedMilliseconds;
+ }
+
+ /**
+ * @return the number of types resulting from the type oracle build which
+ * compiles all of the source files initially presented to the
+ * compiler.
+ */
+ public String[] getInitialTypes() {
+ return initialTypes;
+ }
+
+ /**
+ * @return the source files initially presented to the compiler
+ */
+ public String[] getSourceFiles() {
+ return sourceFiles;
+ }
+
+ @Override
+ public int hashCode() {
+ return getName().hashCode();
+ }
+
+ /**
+ * @param elapsedMilliseconds wall clock time elapsed since start of module
+ * load to end of the initial type oracle build.
+ */
+ public ModuleMetricsArtifact setElapsedMilliseconds(long elapsedMilliseconds) {
+ this.elapsedMilliseconds = elapsedMilliseconds;
+ return this;
+ }
+
+ /**
+ * @param initialTypes the number of types resulting from the initial type
+ * oracle build which compiles all of the source files initially
+ * presented to the compiler.
+ */
+ public ModuleMetricsArtifact setInitialTypes(Collection<String> initialTypes) {
+ this.initialTypes = initialTypes.toArray(new String[initialTypes.size()]);
+ return this;
+ }
+
+ /**
+ * @param sourceFiles the list of source files presented to the compiler on
+ * the module source path.
+ */
+ public ModuleMetricsArtifact setSourceFiles(String[] sourceFiles) {
+ this.sourceFiles = sourceFiles;
+ return this;
+ }
+
+ @Override
+ protected int compareToComparableArtifact(ModuleMetricsArtifact o) {
+ return getName().compareTo(o.getName());
+ }
+
+ @Override
+ protected final Class<ModuleMetricsArtifact> getComparableArtifactType() {
+ return ModuleMetricsArtifact.class;
+ }
+
+ private String getName() {
+ return "ModuleMetricsArtifact-" + instanceId;
+ }
+}
diff --git a/dev/core/src/com/google/gwt/core/ext/linker/PrecompilationMetricsArtifact.java b/dev/core/src/com/google/gwt/core/ext/linker/PrecompilationMetricsArtifact.java
new file mode 100644
index 0000000..73013db
--- /dev/null
+++ b/dev/core/src/com/google/gwt/core/ext/linker/PrecompilationMetricsArtifact.java
@@ -0,0 +1,132 @@
+/*
+ * Copyright 2010 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package com.google.gwt.core.ext.linker;
+
+import com.google.gwt.core.ext.Linker;
+import com.google.gwt.core.linker.SoycReportLinker;
+
+import java.util.List;
+
+/**
+ * Captures some metrics from the precompilation step.
+ */
+@Transferable
+public class PrecompilationMetricsArtifact extends Artifact<PrecompilationMetricsArtifact> {
+
+ private long elapsedMilliseconds;
+ private final int permutationBase;
+ private int[] permutationIds;
+ private String[] finalTypeOracleTypes;
+ private String[] referencedAstTypes;
+
+ public PrecompilationMetricsArtifact(int permutationId) {
+ this(SoycReportLinker.class, permutationId);
+ }
+
+ protected PrecompilationMetricsArtifact(Class<? extends Linker> linker, int permutationBase) {
+ super(linker);
+ this.permutationBase = permutationBase;
+ }
+
+ /**
+ * @return the number of types referenced by the AST.
+ */
+ public String[] getAstTypes() {
+ return referencedAstTypes;
+ }
+
+ /**
+ * @return wall clock time elapsed since start of precompilation
+ */
+ public long getElapsedMilliseconds() {
+ return elapsedMilliseconds;
+ }
+
+ /**
+ * @return types all types referenced by type oracle after compiling the
+ * sources on the source path with JDT.
+ */
+ public String[] getFinalTypeOracleTypes() {
+ return this.finalTypeOracleTypes;
+ }
+
+ /**
+ * @return the first permutation Id associated with compiling this permutation.
+ */
+ public int getPermuationBase() {
+ return permutationBase;
+ }
+
+ /**
+ * @return the permutation ids associated with this precompilation.
+ */
+ public int[] getPermutationIds() {
+ return permutationIds;
+ }
+
+ @Override
+ public int hashCode() {
+ return getName().hashCode();
+ }
+
+ /**
+ * @param astTypes an array of types referenced by the Java AST.
+ */
+ public PrecompilationMetricsArtifact setAstTypes(String[] astTypes) {
+ this.referencedAstTypes = astTypes;
+ return this;
+ }
+
+ /**
+ * @param elapsedMilliseconds wall clock time elapsed since start of
+ * precompilation
+ */
+ public PrecompilationMetricsArtifact setElapsedMilliseconds(long elapsedMilliseconds) {
+ this.elapsedMilliseconds = elapsedMilliseconds;
+ return this;
+ }
+
+ /**
+ * @param types all types referenced by type oracle after compiling the
+ * sources on the source path with JDT.
+ */
+ public PrecompilationMetricsArtifact setFinalTypeOracleTypes(List<String> types) {
+ this.finalTypeOracleTypes = types.toArray(new String[types.size()]);
+ return this;
+ }
+
+ /**
+ * @param ids the permutation ids associated with this precompilation.
+ */
+ public PrecompilationMetricsArtifact setPermuationIds(int[] ids) {
+ this.permutationIds = ids;
+ return this;
+ }
+ @Override
+ protected int compareToComparableArtifact(PrecompilationMetricsArtifact o) {
+ return getName().compareTo(o.getName());
+ }
+
+ @Override
+ protected final Class<PrecompilationMetricsArtifact> getComparableArtifactType() {
+ return PrecompilationMetricsArtifact.class;
+ }
+
+ private String getName() {
+ return "PrecompilationMetricsArtifact-" + permutationBase;
+ }
+}
diff --git a/dev/core/src/com/google/gwt/core/linker/SoycReportLinker.java b/dev/core/src/com/google/gwt/core/linker/SoycReportLinker.java
index b03ce63..bdc8c40 100644
--- a/dev/core/src/com/google/gwt/core/linker/SoycReportLinker.java
+++ b/dev/core/src/com/google/gwt/core/linker/SoycReportLinker.java
@@ -23,10 +23,13 @@
import com.google.gwt.core.ext.linker.CompilationResult;
import com.google.gwt.core.ext.linker.EmittedArtifact;
import com.google.gwt.core.ext.linker.LinkerOrder;
+import com.google.gwt.core.ext.linker.LinkerOrder.Order;
+import com.google.gwt.core.ext.linker.ModuleMetricsArtifact;
import com.google.gwt.core.ext.linker.SelectionProperty;
import com.google.gwt.core.ext.linker.Shardable;
+import com.google.gwt.core.ext.linker.SyntheticArtifact;
import com.google.gwt.core.ext.linker.Transferable;
-import com.google.gwt.core.ext.linker.LinkerOrder.Order;
+import com.google.gwt.soyc.CompilerMetricsXmlFormatter;
import com.google.gwt.soyc.SoycDashboard;
import com.google.gwt.soyc.io.ArtifactsOutputDirectory;
@@ -34,6 +37,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import java.util.TreeMap;
/**
@@ -109,19 +113,39 @@
@Override
public ArtifactSet link(TreeLogger logger, LinkerContext context,
ArtifactSet artifacts, boolean onePermutation) {
- if (!anyReportFilesPresent(artifacts)) {
- // No report was generated
+
+ boolean reportFilesPresent = anyReportFilesPresent(artifacts);
+ boolean metricsPresent = anyCompilerMetricsPresent(artifacts);
+
+ if (!reportFilesPresent && !metricsPresent) {
return artifacts;
}
-
- if (onePermutation) {
- return emitPermutationDescriptions(artifacts);
- } else {
- return buildTopLevelFiles(logger, artifacts);
+
+ artifacts = new ArtifactSet(artifacts);
+
+ if (!onePermutation) {
+ buildCompilerMetricsXml(artifacts);
}
+
+ if (reportFilesPresent) {
+ if (onePermutation) {
+ emitPermutationDescriptions(artifacts);
+ } else {
+ buildTopLevelFiles(logger, artifacts);
+ }
+ }
+
+ return artifacts;
}
/**
+ * Check whether an artifact set contains any compilerMetrics
+ */
+ boolean anyCompilerMetricsPresent(ArtifactSet artifacts) {
+ return !artifacts.find(ModuleMetricsArtifact.class).isEmpty();
+ }
+
+ /**
* Check whether an artifact set contains any SOYC report documents.
*/
boolean anyReportFilesPresent(ArtifactSet artifacts) {
@@ -140,10 +164,37 @@
return false;
}
- private ArtifactSet buildTopLevelFiles(TreeLogger logger,
- ArtifactSet artifacts) {
- artifacts = new ArtifactSet(artifacts);
+ /**
+ * Compiler Metrics are captured in the module load, precompilation,
+ * and compile permutations step, then all merged together into a single
+ * XML file as output. That file can then be consumed by external
+ * reporting tools.
+ */
+ private void buildCompilerMetricsXml(ArtifactSet artifacts) {
+ ModuleMetricsArtifact moduleMetrics = null;
+ Set<ModuleMetricsArtifact> moduleMetricsSet = artifacts.find(ModuleMetricsArtifact.class);
+ if (!moduleMetricsSet.isEmpty()) {
+ for (ModuleMetricsArtifact metrics : moduleMetricsSet) {
+ moduleMetrics = metrics;
+ // We only need one module metrics definition.
+ break;
+ }
+ }
+ // No module metrics? Then we'll skip creating the compilerMetrics output
+ if (moduleMetrics == null) {
+ return;
+ }
+
+ byte[] xmlResult = CompilerMetricsXmlFormatter.writeMetricsAsXml(artifacts, moduleMetrics);
+ EmittedArtifact metricsArtifact = new SyntheticArtifact(SoycReportLinker.class,
+ "compilerMetrics.xml", xmlResult);
+ metricsArtifact.setPrivate(true);
+ artifacts.add(metricsArtifact);
+ }
+
+ private void buildTopLevelFiles(TreeLogger logger,
+ ArtifactSet artifacts) {
ArtifactsOutputDirectory out = new ArtifactsOutputDirectory();
try {
new SoycDashboard(out).generateCrossPermutationFiles(extractPermutationDescriptions(artifacts));
@@ -154,12 +205,9 @@
}
artifacts.addAll(out.getArtifacts());
- return artifacts;
}
- private ArtifactSet emitPermutationDescriptions(ArtifactSet artifacts) {
- artifacts = new ArtifactSet(artifacts);
-
+ private void emitPermutationDescriptions(ArtifactSet artifacts) {
for (CompilationResult res : artifacts.find(CompilationResult.class)) {
int permId = res.getPermutationId();
List<String> permDesc = new ArrayList<String>();
@@ -169,8 +217,6 @@
artifacts.add(new PermDescriptionArtifact(permId, permDesc));
}
-
- return artifacts;
}
private Map<String, List<String>> extractPermutationDescriptions(
diff --git a/dev/core/src/com/google/gwt/dev/Precompile.java b/dev/core/src/com/google/gwt/dev/Precompile.java
index 2febeac..52b1ea3 100644
--- a/dev/core/src/com/google/gwt/dev/Precompile.java
+++ b/dev/core/src/com/google/gwt/dev/Precompile.java
@@ -1,12 +1,12 @@
/*
* Copyright 2008 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -19,7 +19,10 @@
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.core.ext.UnableToCompleteException;
import com.google.gwt.core.ext.linker.ArtifactSet;
+import com.google.gwt.core.ext.linker.ModuleMetricsArtifact;
+import com.google.gwt.core.ext.linker.PrecompilationMetricsArtifact;
import com.google.gwt.core.ext.linker.impl.StandardLinkerContext;
+import com.google.gwt.core.ext.typeinfo.JClassType;
import com.google.gwt.dev.CompileTaskRunner.CompileTask;
import com.google.gwt.dev.cfg.BindingProperty;
import com.google.gwt.dev.cfg.ConfigurationProperty;
@@ -46,6 +49,7 @@
import com.google.gwt.dev.util.Memory;
import com.google.gwt.dev.util.Util;
import com.google.gwt.dev.util.arg.ArgHandlerCompileReport;
+import com.google.gwt.dev.util.arg.ArgHandlerCompilerMetrics;
import com.google.gwt.dev.util.arg.ArgHandlerDisableAggressiveOptimization;
import com.google.gwt.dev.util.arg.ArgHandlerDisableCastChecking;
import com.google.gwt.dev.util.arg.ArgHandlerDisableClassMetadata;
@@ -68,6 +72,7 @@
import com.google.gwt.dev.util.arg.OptionGenDir;
import com.google.gwt.dev.util.arg.OptionMaxPermsPerPrecompile;
import com.google.gwt.dev.util.arg.OptionValidateOnly;
+import com.google.gwt.dev.util.collect.HashSet;
import com.google.gwt.dev.util.collect.Lists;
import com.google.gwt.dev.util.log.speedtracer.CompilerEventType;
import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger;
@@ -76,10 +81,10 @@
import java.awt.GraphicsEnvironment;
import java.io.File;
import java.io.Serializable;
+import java.lang.management.ManagementFactory;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
-import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -125,6 +130,7 @@
registerHandler(new ArgHandlerSoyc(options));
registerHandler(new ArgHandlerSoycDetailed(options));
registerHandler(new ArgHandlerStrict(options));
+ registerHandler(new ArgHandlerCompilerMetrics(options));
}
@Override
@@ -189,6 +195,10 @@
return jjsOptions.isClassMetadataDisabled();
}
+ public boolean isCompilerMetricsEnabled() {
+ return jjsOptions.isCompilerMetricsEnabled();
+ }
+
public boolean isDraftCompile() {
return jjsOptions.isDraftCompile();
}
@@ -241,6 +251,10 @@
jjsOptions.setClassMetadataDisabled(disabled);
}
+ public void setCompilerMetricsEnabled(boolean enabled) {
+ jjsOptions.setCompilerMetricsEnabled(enabled);
+ }
+
public void setDisableUpdateCheck(boolean disabled) {
disableUpdateCheck = disabled;
}
@@ -451,7 +465,7 @@
/**
* Precompiles the given module.
- *
+ *
* @param logger a logger to use
* @param jjsOptions a set of compiler options
* @param module the module to compile
@@ -468,12 +482,12 @@
/**
* Validates the given module can be compiled.
- *
+ *
* @param logger a logger to use
* @param jjsOptions a set of compiler options
* @param module the module to compile
- * @param genDir optional directory to dump generated source, may be
- * <code>null</code>
+ * @param genDir optional directory to dump generated source, may be
+ * <code>null</code>
*/
public static boolean validate(TreeLogger logger, JJSOptions jjsOptions,
ModuleDef module, File genDir) {
@@ -505,7 +519,7 @@
// Never optimize on a validation run.
jjsOptions.setOptimizePrecompile(false);
getCompiler(module).precompile(logger, module, rpo, declEntryPts,
- additionalRootTypes, jjsOptions, true);
+ additionalRootTypes, jjsOptions, true, null);
return true;
} catch (UnableToCompleteException e) {
// Already logged.
@@ -518,6 +532,15 @@
static Precompilation precompile(TreeLogger logger, JJSOptions jjsOptions,
ModuleDef module, int permutationBase,
PropertyPermutations allPermutations, File genDir) {
+ return precompile(logger, jjsOptions, module, permutationBase,
+ allPermutations, genDir,
+ ManagementFactory.getRuntimeMXBean().getStartTime());
+ }
+
+ static Precompilation precompile(TreeLogger logger, JJSOptions jjsOptions,
+ ModuleDef module, int permutationBase,
+ PropertyPermutations allPermutations, File genDir,
+ long startTimeMilliseconds) {
Event precompileEvent = SpeedTracerLogger.start(CompilerEventType.PRECOMPILE);
@@ -531,6 +554,17 @@
abortDueToStrictMode(logger);
}
+ List<String> initialTypeOracleTypes = new ArrayList<String>();
+ if (jjsOptions.isCompilerMetricsEnabled()) {
+ for (JClassType type : compilationState.getTypeOracle().getTypes()) {
+ initialTypeOracleTypes.add(type.getPackage().getName() + "." + type.getName());
+ }
+ }
+
+ // Track information about the module load including initial type
+ // oracle build for diagnostic purposes.
+ long moduleLoadFinished = System.currentTimeMillis();
+
String[] declEntryPts = module.getEntryPointTypeNames();
if (declEntryPts.length == 0) {
logger.log(TreeLogger.ERROR, "Module has no entry points defined", null);
@@ -542,8 +576,24 @@
module, compilationState, generatedArtifacts, allPermutations, genDir);
// Allow GC later.
compilationState = null;
+ PrecompilationMetricsArtifact precompilationMetrics = jjsOptions.isCompilerMetricsEnabled()
+ ? new PrecompilationMetricsArtifact(permutationBase) : null;
UnifiedAst unifiedAst = getCompiler(module).precompile(logger, module,
- rpo, declEntryPts, null, jjsOptions, rpo.getPermuationCount() == 1);
+ rpo, declEntryPts, null, jjsOptions, rpo.getPermuationCount() == 1,
+ precompilationMetrics);
+
+ if (jjsOptions.isCompilerMetricsEnabled()) {
+ ModuleMetricsArtifact moduleMetrics = new ModuleMetricsArtifact();
+ moduleMetrics.setSourceFiles(module.getAllSourceFiles());
+ // The initial type list has to be gathered before the call to
+ // precompile().
+ moduleMetrics.setInitialTypes(initialTypeOracleTypes);
+ // The elapsed time in ModuleMetricsArtifact represents time
+ // which could be done once for all permutations.
+ moduleMetrics.setElapsedMilliseconds(moduleLoadFinished
+ - startTimeMilliseconds);
+ unifiedAst.setModuleMetrics(moduleMetrics);
+ }
// Merge all identical permutations together.
List<Permutation> permutations = new ArrayList<Permutation>(
@@ -565,7 +615,20 @@
merged.put(key, permutation);
}
}
-
+ if (jjsOptions.isCompilerMetricsEnabled()) {
+ int[] ids = new int[allPermutations.size()];
+ for (int i = 0; i < allPermutations.size(); i++) {
+ ids[i] = permutationBase + i;
+ }
+ precompilationMetrics.setPermuationIds(ids);
+ // TODO(zundel): Right now this double counts module load and
+ // precompile time. It correctly counts the amount of time spent
+ // in this process. The elapsed time in ModuleMetricsArtifact
+ // represents time which could be done once for all permutations.
+ precompilationMetrics.setElapsedMilliseconds(System.currentTimeMillis()
+ - startTimeMilliseconds);
+ unifiedAst.setPrecompilationMetrics(precompilationMetrics);
+ }
return new Precompilation(unifiedAst, merged.values(), permutationBase,
generatedArtifacts);
} catch (UnableToCompleteException e) {
@@ -661,13 +724,14 @@
}
public boolean run(TreeLogger logger) throws UnableToCompleteException {
- // Avoid early optimizations since permutation compiles will run separately.
+ // Avoid early optimizations since permutation compiles will run
+ // separately.
options.setOptimizePrecompile(false);
for (String moduleName : options.getModuleNames()) {
File compilerWorkDir = options.getCompilerWorkDir(moduleName);
Util.recursiveDelete(compilerWorkDir, true);
- // No need to check mkdirs result because an IOException will occur anyway
+ // No need to check mkdirs result because an IOException will occur anyway.
compilerWorkDir.mkdirs();
File precompilationFile = new File(compilerWorkDir, PRECOMPILE_FILENAME);
@@ -740,7 +804,6 @@
}
}
}
-
return true;
}
}
diff --git a/dev/core/src/com/google/gwt/dev/cfg/ModuleDef.java b/dev/core/src/com/google/gwt/dev/cfg/ModuleDef.java
index da9dcb8..d90ac5f6 100644
--- a/dev/core/src/com/google/gwt/dev/cfg/ModuleDef.java
+++ b/dev/core/src/com/google/gwt/dev/cfg/ModuleDef.java
@@ -46,8 +46,8 @@
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
-import java.util.Set;
import java.util.Map.Entry;
+import java.util.Set;
/**
* Represents a module specification. In principle, this could be built without
@@ -287,6 +287,14 @@
}
/**
+ * Strictly for statistics gathering. There is no guarantee that the source
+ * oracle has been initialized.
+ */
+ public String[] getAllSourceFiles() {
+ return lazySourceOracle.getPathNames().toArray(Empty.STRINGS);
+ }
+
+ /**
* Returns the physical name for the module by which it can be found in the
* classpath.
*/
@@ -487,7 +495,7 @@
branch = Messages.SOURCE_PATH_LOCATIONS.branch(logger, null);
lazySourceOracle = new ResourceOracleImpl(branch);
lazySourceOracle.setPathPrefixes(sourcePrefixSet);
-
+
ResourceOracleImpl.refresh(logger, lazyPublicOracle, lazySourceOracle);
if (lazySourceOracle.getResources().isEmpty()) {
branch.log(TreeLogger.WARN,
diff --git a/dev/core/src/com/google/gwt/dev/jjs/AbstractCompiler.java b/dev/core/src/com/google/gwt/dev/jjs/AbstractCompiler.java
index 6f1b0b6..92e40b8 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/AbstractCompiler.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/AbstractCompiler.java
@@ -1,12 +1,12 @@
/*
* Copyright 2009 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -17,6 +17,7 @@
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.core.ext.UnableToCompleteException;
+import com.google.gwt.core.ext.linker.PrecompilationMetricsArtifact;
import com.google.gwt.dev.cfg.ModuleDef;
import com.google.gwt.dev.jdt.RebindPermutationOracle;
@@ -27,7 +28,7 @@
/**
* Performs a precompilation, returning an object that can then be used to
* compile individual permutations..
- *
+ *
* @param logger the logger to use
* @param module the module to compile
* @param rpo the RebindPermutationOracle
@@ -38,6 +39,8 @@
* @param options the compiler options
* @param singlePermutation if true, do not pre-optimize the resulting AST or
* allow serialization of the result
+ * @param precompilationMetrics if not null, the precompile with gather some
+ * diagnostics for the compile.
* @return the unified AST used to drive permutation compiles
* @throws UnableToCompleteException if an error other than
* {@link OutOfMemoryError} occurs
@@ -45,5 +48,6 @@
UnifiedAst precompile(TreeLogger logger, ModuleDef module,
RebindPermutationOracle rpo, String[] declEntryPts,
String[] additionalRootTypes, JJSOptions options,
- boolean singlePermutation) throws UnableToCompleteException;
+ boolean singlePermutation,
+ PrecompilationMetricsArtifact precompilationMetrics) throws UnableToCompleteException;
}
diff --git a/dev/core/src/com/google/gwt/dev/jjs/JJSOptions.java b/dev/core/src/com/google/gwt/dev/jjs/JJSOptions.java
index dae93ae..96226c3 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/JJSOptions.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/JJSOptions.java
@@ -16,6 +16,7 @@
package com.google.gwt.dev.jjs;
import com.google.gwt.dev.util.arg.OptionAggressivelyOptimize;
+import com.google.gwt.dev.util.arg.OptionCompilerMetricsEnabled;
import com.google.gwt.dev.util.arg.OptionDisableCastChecking;
import com.google.gwt.dev.util.arg.OptionDisableClassMetadata;
import com.google.gwt.dev.util.arg.OptionEnableAssertions;
@@ -34,5 +35,5 @@
OptionDisableClassMetadata, OptionDisableCastChecking,
OptionEnableAssertions, OptionRunAsyncEnabled, OptionScriptStyle,
OptionSoycEnabled, OptionSoycDetailed, OptionOptimizePrecompile,
- OptionStrict {
+ OptionStrict, OptionCompilerMetricsEnabled {
}
diff --git a/dev/core/src/com/google/gwt/dev/jjs/JJSOptionsImpl.java b/dev/core/src/com/google/gwt/dev/jjs/JJSOptionsImpl.java
index 88dae70..af63621 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/JJSOptionsImpl.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/JJSOptionsImpl.java
@@ -1,12 +1,12 @@
/*
* Copyright 2008 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -35,6 +35,7 @@
private boolean soycExtra = false;
private boolean strict = false;
private int optimizationLevel = OptionOptimize.OPTIMIZE_LEVEL_MAX;
+ private boolean compilerMetricsEnabled = false;
public JJSOptionsImpl() {
}
@@ -46,6 +47,7 @@
public void copyFrom(JJSOptions other) {
setCastCheckingDisabled(other.isCastCheckingDisabled());
setClassMetadataDisabled(other.isClassMetadataDisabled());
+ setCompilerMetricsEnabled(other.isCompilerMetricsEnabled());
setEnableAssertions(other.isEnableAssertions());
setAggressivelyOptimize(other.isAggressivelyOptimize());
setOptimizationLevel(other.getOptimizationLevel());
@@ -59,7 +61,7 @@
public int getOptimizationLevel() {
return optimizationLevel;
}
-
+
public JsOutputOption getOutput() {
return output;
}
@@ -76,6 +78,10 @@
return disableClassMetadata;
}
+ public boolean isCompilerMetricsEnabled() {
+ return compilerMetricsEnabled;
+ }
+
public boolean isDraftCompile() {
return optimizationLevel == OptionOptimize.OPTIMIZE_LEVEL_DRAFT;
}
@@ -116,6 +122,10 @@
disableClassMetadata = disabled;
}
+ public void setCompilerMetricsEnabled(boolean enabled) {
+ this.compilerMetricsEnabled = enabled;
+ }
+
public void setEnableAssertions(boolean enableAssertions) {
this.enableAssertions = enableAssertions;
}
diff --git a/dev/core/src/com/google/gwt/dev/jjs/JavaScriptCompiler.java b/dev/core/src/com/google/gwt/dev/jjs/JavaScriptCompiler.java
index 9968909..e3fe2b2 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/JavaScriptCompiler.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/JavaScriptCompiler.java
@@ -1,12 +1,12 @@
/*
* Copyright 2009 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -17,6 +17,7 @@
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.core.ext.UnableToCompleteException;
+import com.google.gwt.core.ext.linker.PrecompilationMetricsArtifact;
import com.google.gwt.dev.cfg.ModuleDef;
import com.google.gwt.dev.jdt.RebindPermutationOracle;
@@ -28,9 +29,11 @@
public UnifiedAst precompile(TreeLogger logger, ModuleDef module,
RebindPermutationOracle rpo, String[] declEntryPts,
String[] additionalRootTypes, JJSOptions options,
- boolean singlePermutation) throws UnableToCompleteException {
+ boolean singlePermutation,
+ PrecompilationMetricsArtifact precompilationMetrics)
+ throws UnableToCompleteException {
return JavaToJavaScriptCompiler.precompile(logger, module, rpo,
- declEntryPts, additionalRootTypes, options, singlePermutation);
+ declEntryPts, additionalRootTypes, options, singlePermutation,
+ precompilationMetrics);
}
-
}
diff --git a/dev/core/src/com/google/gwt/dev/jjs/JavaToJavaScriptCompiler.java b/dev/core/src/com/google/gwt/dev/jjs/JavaToJavaScriptCompiler.java
index 804b279..722431b 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/JavaToJavaScriptCompiler.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/JavaToJavaScriptCompiler.java
@@ -22,7 +22,9 @@
import com.google.gwt.core.ext.UnableToCompleteException;
import com.google.gwt.core.ext.linker.Artifact;
import com.google.gwt.core.ext.linker.ArtifactSet;
+import com.google.gwt.core.ext.linker.CompilationMetricsArtifact;
import com.google.gwt.core.ext.linker.EmittedArtifact;
+import com.google.gwt.core.ext.linker.PrecompilationMetricsArtifact;
import com.google.gwt.core.ext.linker.StatementRanges;
import com.google.gwt.core.ext.linker.SymbolData;
import com.google.gwt.core.ext.linker.SyntheticArtifact;
@@ -127,6 +129,7 @@
import com.google.gwt.dev.util.TextOutput;
import com.google.gwt.dev.util.Util;
import com.google.gwt.dev.util.arg.OptionOptimize;
+import com.google.gwt.dev.util.collect.Lists;
import com.google.gwt.dev.util.collect.Maps;
import com.google.gwt.dev.util.log.speedtracer.CompilerEventType;
import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger;
@@ -145,6 +148,7 @@
import java.io.IOException;
import java.io.OutputStream;
import java.io.PrintWriter;
+import java.lang.management.ManagementFactory;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -163,10 +167,9 @@
* JavaScript source.
*/
public class JavaToJavaScriptCompiler {
-
- private static final String ENUM_NAME_OBFUSCATION_PROPERTY =
- "compiler.enum.obfuscate.names";
-
+
+ private static final String ENUM_NAME_OBFUSCATION_PROPERTY = "compiler.enum.obfuscate.names";
+
private static class PermutationResultImpl implements PermutationResult {
private final ArtifactSet artifacts = new ArtifactSet();
private final byte[][] js;
@@ -231,13 +234,15 @@
return true;
}
}
-
+
/**
* Compiles a particular permutation, based on a precompiled unified AST.
*
* @param logger the logger to use
* @param unifiedAst the result of a
- * {@link #precompile(TreeLogger, ModuleDef, RebindPermutationOracle, String[], String[], JJSOptions, boolean)}
+ * {@link #precompile(TreeLogger, ModuleDef, RebindPermutationOracle,
+ * String[], String[], JJSOptions, boolean,
+ * PrecompilationMetricsArtifact)}
* @param permutation the permutation to compile
* @return the output JavaScript
* @throws UnableToCompleteException if an error other than
@@ -246,9 +251,12 @@
public static PermutationResult compilePermutation(TreeLogger logger,
UnifiedAst unifiedAst, Permutation permutation)
throws UnableToCompleteException {
- Event jjsCompilePermutationEvent =
- SpeedTracerLogger.start(CompilerEventType.JJS_COMPILE_PERMUTATION, "name",
- permutation.prettyPrint());
+ JJSOptions options = unifiedAst.getOptions();
+ long startTimeMilliseconds = System.currentTimeMillis();
+
+ Event jjsCompilePermutationEvent = SpeedTracerLogger.start(
+ CompilerEventType.JJS_COMPILE_PERMUTATION, "name",
+ permutation.prettyPrint());
InternalCompilerException.preload();
PropertyOracle[] propertyOracles = permutation.getPropertyOracles();
@@ -267,7 +275,7 @@
AST ast = unifiedAst.getFreshAst();
JProgram jprogram = ast.getJProgram();
JsProgram jsProgram = ast.getJsProgram();
- JJSOptions options = unifiedAst.getOptions();
+
Map<StandardSymbolData, JsName> symbolTable = new TreeMap<StandardSymbolData, JsName>(
new SymbolData.ClassIdentComparator());
@@ -411,10 +419,11 @@
// (12) Generate the final output text.
String[] js = new String[jsProgram.getFragmentCount()];
StatementRanges[] ranges = new StatementRanges[js.length];
- SizeBreakdown[] sizeBreakdowns = options.isSoycEnabled()
- ? new SizeBreakdown[js.length] : null;
- List<Map<Range, SourceInfo>> sourceInfoMaps = options.isSoycExtra()
- ? new ArrayList<Map<Range, SourceInfo>>() : null;
+ SizeBreakdown[] sizeBreakdowns =
+ options.isSoycEnabled() || options.isCompilerMetricsEnabled() ?
+ new SizeBreakdown[js.length] : null;
+ List<Map<Range, SourceInfo>> sourceInfoMaps = options.isSoycExtra() ?
+ new ArrayList<Map<Range, SourceInfo>>() : null;
generateJavaScriptCode(options, jsProgram, map, js, ranges,
sizeBreakdowns, sourceInfoMaps, splitBlocks);
@@ -422,7 +431,17 @@
makeSymbolMap(symbolTable), ranges);
toReturn.addArtifacts(makeSoycArtifacts(logger, permutationId, jprogram,
js, sizeBreakdowns, sourceInfoMaps, dependencies, map, obfuscateMap));
-
+ if (options.isCompilerMetricsEnabled()) {
+ CompilationMetricsArtifact compilationMetrics = new CompilationMetricsArtifact(permutation.getId());
+ compilationMetrics.setCompileElapsedMilliseconds(System.currentTimeMillis()
+ - startTimeMilliseconds);
+ compilationMetrics.setElapsedMilliseconds(System.currentTimeMillis()
+ - ManagementFactory.getRuntimeMXBean().getStartTime());
+ compilationMetrics.setJsSize(sizeBreakdowns);
+ compilationMetrics.setPermutationDescription(permutation.prettyPrint());
+ toReturn.addArtifacts(Lists.create(unifiedAst.getModuleMetrics(),
+ unifiedAst.getPrecompilationMetrics(), compilationMetrics));
+ }
logger.log(TreeLogger.TRACE, "Permutation took "
+ (System.currentTimeMillis() - permStart) + " ms");
return toReturn;
@@ -433,6 +452,14 @@
}
}
+ public static UnifiedAst precompile(TreeLogger logger, ModuleDef module,
+ RebindPermutationOracle rpo, String[] declEntryPts,
+ String[] additionalRootTypes, JJSOptions options,
+ boolean singlePermutation) throws UnableToCompleteException {
+ return precompile(logger, module, rpo, declEntryPts, additionalRootTypes,
+ options, singlePermutation, null);
+ }
+
/**
* Performs a precompilation, returning a unified AST.
*
@@ -446,6 +473,8 @@
* @param options the compiler options
* @param singlePermutation if true, do not pre-optimize the resulting AST or
* allow serialization of the result
+ * @param precompilationMetrics if not null, gather diagnostic information
+ * from this build for a report.
* @return the unified AST used to drive permutation compiles
* @throws UnableToCompleteException if an error other than
* {@link OutOfMemoryError} occurs
@@ -453,7 +482,9 @@
public static UnifiedAst precompile(TreeLogger logger, ModuleDef module,
RebindPermutationOracle rpo, String[] declEntryPts,
String[] additionalRootTypes, JJSOptions options,
- boolean singlePermutation) throws UnableToCompleteException {
+ boolean singlePermutation,
+ PrecompilationMetricsArtifact precompilationMetrics)
+ throws UnableToCompleteException {
InternalCompilerException.preload();
@@ -478,20 +509,27 @@
allRootTypes.add(FragmentLoaderCreator.ASYNC_FRAGMENT_LOADER);
Memory.maybeDumpMemory("CompStateBuilt");
-
+
// Compile the source and get the compiler so we can get the parse tree
- //
CompilationUnitDeclaration[] goldenCuds = WebModeCompilerFrontEnd.getCompilationUnitDeclarations(
logger, allRootTypes.toArray(new String[allRootTypes.size()]), rpo,
TypeLinker.NULL_TYPE_LINKER).compiledUnits;
+ List<String> finalTypeOracleTypes = Lists.create();
+ if (precompilationMetrics != null) {
+ for (com.google.gwt.core.ext.typeinfo.JClassType type : rpo.getCompilationState().getTypeOracle().getTypes()) {
+ finalTypeOracleTypes = Lists.add(finalTypeOracleTypes,
+ type.getPackage().getName() + "." + type.getName());
+ }
+ precompilationMetrics.setFinalTypeOracleTypes(finalTypeOracleTypes);
+ }
+
// Free up memory.
rpo.clear();
Memory.maybeDumpMemory("GoldenCudsBuilt");
-
+
// Check for compilation problems. We don't log here because any problems
// found here will have already been logged by AbstractCompiler.
- //
checkForErrors(logger, goldenCuds, false);
CorrelationFactory correlator = options.isSoycExtra()
@@ -523,7 +561,7 @@
checkForErrors(logger, goldenCuds, true);
Memory.maybeDumpMemory("AstBuilt");
-
+
// Allow GC
goldenCuds = null;
typeMap = null;
@@ -531,17 +569,17 @@
Memory.maybeDumpMemory("AstOnly");
maybeDumpAST(jprogram);
-
+
// See if we should run the EnumNameObfuscator
if (module != null) {
- ConfigurationProperty enumNameObfuscationProp =
- (ConfigurationProperty) module.getProperties().find(ENUM_NAME_OBFUSCATION_PROPERTY);
- if (enumNameObfuscationProp != null &&
- Boolean.parseBoolean(enumNameObfuscationProp.getValue())) {
+ ConfigurationProperty enumNameObfuscationProp = (ConfigurationProperty) module.getProperties().find(
+ ENUM_NAME_OBFUSCATION_PROPERTY);
+ if (enumNameObfuscationProp != null
+ && Boolean.parseBoolean(enumNameObfuscationProp.getValue())) {
EnumNameObfuscator.exec(jprogram, logger);
}
}
-
+
// (3) Perform Java AST normalizations.
ArtificialRescueRecorder.exec(jprogram);
FixAssignmentToUnbox.exec(jprogram);
@@ -580,7 +618,8 @@
* Don't optimizing early if this is a draft compile, or if there's only
* one permutation.
*/
- if (options.getOptimizationLevel() > OptionOptimize.OPTIMIZE_LEVEL_DRAFT && !singlePermutation) {
+ if (options.getOptimizationLevel() > OptionOptimize.OPTIMIZE_LEVEL_DRAFT
+ && !singlePermutation) {
if (options.isOptimizePrecompile()) {
/*
* Go ahead and optimize early, so that each permutation will run
@@ -605,6 +644,10 @@
Set<String> rebindRequests = new HashSet<String>();
RecordRebinds.exec(jprogram, rebindRequests);
+ if (options.isCompilerMetricsEnabled()) {
+ precompilationMetrics.setAstTypes(getReferencedJavaClasses(jprogram));
+ }
+
Event createUnifiedAstEvent = SpeedTracerLogger.start(CompilerEventType.CREATE_UNIFIED_AST);
UnifiedAst result = new UnifiedAst(options, new AST(jprogram, jsProgram),
singlePermutation, rebindRequests);
@@ -636,9 +679,9 @@
}
protected static void optimize(JJSOptions options, JProgram jprogram)
- throws InterruptedException {
+ throws InterruptedException {
Event optimizeEvent = SpeedTracerLogger.start(CompilerEventType.OPTIMIZE);
-
+
/*
* Record the beginning of optimizations; this turns on certain checks that
* guard against problematic late construction of things like class
@@ -648,10 +691,11 @@
List<OptimizerStats> allOptimizerStats = new ArrayList<OptimizerStats>();
int counter = 0;
- int optimizationLevel = options.getOptimizationLevel();
+ int optimizationLevel = options.getOptimizationLevel();
while (true) {
counter++;
- if (optimizationLevel < OptionOptimize.OPTIMIZE_LEVEL_MAX && counter > optimizationLevel) {
+ if (optimizationLevel < OptionOptimize.OPTIMIZE_LEVEL_MAX
+ && counter > optimizationLevel) {
break;
}
if (Thread.interrupted()) {
@@ -659,7 +703,8 @@
throw new InterruptedException();
}
maybeDumpAST(jprogram);
- OptimizerStats stats = optimizeLoop("Pass " + counter, jprogram, options.isAggressivelyOptimize());
+ OptimizerStats stats = optimizeLoop("Pass " + counter, jprogram,
+ options.isAggressivelyOptimize());
allOptimizerStats.add(stats);
if (!stats.didChange()) {
break;
@@ -670,7 +715,7 @@
// Just run it once, because it is very time consuming
allOptimizerStats.add(DataflowOptimizer.exec(jprogram));
}
-
+
if (JProgram.isTracingEnabled()) {
System.out.println("");
System.out.println(" Java Optimization Stats");
@@ -683,7 +728,8 @@
optimizeEvent.end();
}
- protected static void optimizeJs(JJSOptions options, JsProgram jsProgram) throws InterruptedException {
+ protected static void optimizeJs(JJSOptions options, JsProgram jsProgram)
+ throws InterruptedException {
List<OptimizerStats> allOptimizerStats = new ArrayList<OptimizerStats>();
int counter = 0;
while (true) {
@@ -692,9 +738,9 @@
throw new InterruptedException();
}
Event optimizeJsEvent = SpeedTracerLogger.start(CompilerEventType.OPTIMIZE_JS);
-
+
OptimizerStats stats = new OptimizerStats("Pass " + counter);
-
+
// Remove unused functions, possible
stats.add(JsStaticEval.exec(jsProgram));
// Inline JavaScript function invocations
@@ -704,10 +750,10 @@
// Save the stats to print out after optimizers finish.
allOptimizerStats.add(stats);
-
+
optimizeJsEvent.end();
int optimizationLevel = options.getOptimizationLevel();
- if ((optimizationLevel < OptionOptimize.OPTIMIZE_LEVEL_MAX && counter > optimizationLevel)
+ if ((optimizationLevel < OptionOptimize.OPTIMIZE_LEVEL_MAX && counter > optimizationLevel)
|| !stats.didChange()) {
break;
}
@@ -723,21 +769,24 @@
}
}
- protected static OptimizerStats optimizeLoop(String passName, JProgram jprogram,
- boolean isAggressivelyOptimize) {
- Event optimizeEvent = SpeedTracerLogger.start(CompilerEventType.OPTIMIZE, "phase", "loop");
+ protected static OptimizerStats optimizeLoop(String passName,
+ JProgram jprogram, boolean isAggressivelyOptimize) {
+ Event optimizeEvent = SpeedTracerLogger.start(CompilerEventType.OPTIMIZE,
+ "phase", "loop");
// Count the number of nodes in the AST so we can measure the efficiency of
// the optimizers.
- Event countEvent = SpeedTracerLogger.start(CompilerEventType.OPTIMIZE, "phase", "countNodes");
+ Event countEvent = SpeedTracerLogger.start(CompilerEventType.OPTIMIZE,
+ "phase", "countNodes");
TreeStatistics treeStats = new TreeStatistics();
treeStats.accept(jprogram);
int numNodes = treeStats.getNodeCount();
countEvent.end();
-
+
// Recompute clinits each time, they can become empty.
jprogram.typeOracle.recomputeAfterOptimizations();
- // jprogram.methodOracle = MethodOracleBuilder.buildMethodOracle(jprogram);
+ // jprogram.methodOracle =
+ // MethodOracleBuilder.buildMethodOracle(jprogram);
OptimizerStats stats = new OptimizerStats(passName);
// Remove unreferenced types, fields, methods, [params, locals]
@@ -768,7 +817,8 @@
if (isAggressivelyOptimize) {
// remove same parameters value
- stats.add(SameParameterValueOptimizer.exec(jprogram).recordVisits(numNodes));
+ stats.add(SameParameterValueOptimizer.exec(jprogram).recordVisits(
+ numNodes));
}
// prove that any types that have been culled from the main tree are
@@ -1107,8 +1157,8 @@
SyntheticArtifact sizeMaps = null;
if (sizeBreakdowns != null) {
- Event recordSizeMap =
- SpeedTracerLogger.start(CompilerEventType.MAKE_SOYC_ARTIFACTS, "phase", "recordSizeMap");
+ Event recordSizeMap = SpeedTracerLogger.start(
+ CompilerEventType.MAKE_SOYC_ARTIFACTS, "phase", "recordSizeMap");
baos.reset();
SizeMapRecorder.recordMap(logger, baos, sizeBreakdowns, jjsmap,
obfuscateMap);
@@ -1119,8 +1169,8 @@
}
if (sourceInfoMaps != null) {
- Event recordStories =
- SpeedTracerLogger.start(CompilerEventType.MAKE_SOYC_ARTIFACTS, "phase", "recordStories");
+ Event recordStories = SpeedTracerLogger.start(
+ CompilerEventType.MAKE_SOYC_ARTIFACTS, "phase", "recordStories");
baos.reset();
StoryRecorder.recordStories(logger, baos, sourceInfoMaps, js);
soycArtifacts.add(new SyntheticArtifact(SoycReportLinker.class,
@@ -1139,7 +1189,8 @@
if (sizeBreakdowns != null) {
Event generateCompileReport = SpeedTracerLogger.start(
- CompilerEventType.MAKE_SOYC_ARTIFACTS, "phase", "generateCompileReport");
+ CompilerEventType.MAKE_SOYC_ARTIFACTS, "phase",
+ "generateCompileReport");
ArtifactsOutputDirectory outDir = new ArtifactsOutputDirectory();
SoycDashboard dashboard = new SoycDashboard(outDir);
dashboard.startNewPermutation(Integer.toString(permutationId));
@@ -1264,4 +1315,25 @@
deps.endDependencyGraph();
deps.close();
}
+
+ /**
+ * This method can be used to fetch the list of referenced classs.
+ *
+ * This method is intended to support compiler metrics in the precompile
+ * phase.
+ */
+ private static String[] getReferencedJavaClasses(JProgram jprogram) {
+ class ClassNameVisitor extends JVisitor {
+ List<String> classNames = new ArrayList<String>();
+
+ @Override
+ public boolean visit(JClassType x, Context ctx) {
+ classNames.add(x.getName());
+ return true;
+ }
+ }
+ ClassNameVisitor v = new ClassNameVisitor();
+ v.accept(jprogram);
+ return v.classNames.toArray(new String[v.classNames.size()]);
+ }
}
diff --git a/dev/core/src/com/google/gwt/dev/jjs/UnifiedAst.java b/dev/core/src/com/google/gwt/dev/jjs/UnifiedAst.java
index d2d7a2e..94f794f 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/UnifiedAst.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/UnifiedAst.java
@@ -1,12 +1,12 @@
/*
* Copyright 2008 Google Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -17,6 +17,8 @@
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.core.ext.UnableToCompleteException;
+import com.google.gwt.core.ext.linker.ModuleMetricsArtifact;
+import com.google.gwt.core.ext.linker.PrecompilationMetricsArtifact;
import com.google.gwt.dev.Permutation;
import com.google.gwt.dev.jjs.ast.JProgram;
import com.google.gwt.dev.js.ast.JsProgram;
@@ -68,6 +70,12 @@
private transient AST initialAst;
/**
+ * Metrics for the module load phase. Stored here so they can be written out
+ * as artifacts in the compile phase.
+ */
+ private ModuleMetricsArtifact moduleMetrics;
+
+ /**
* Used for internal synchronization.
*/
private transient Object myLockObject = new Object();
@@ -78,6 +86,12 @@
private final JJSOptions options;
/**
+ * Metrics for the precompilation phase. Stored here so they can be written out
+ * as artifacts in the compile phase.
+ */
+ private PrecompilationMetricsArtifact precompilationMetrics;
+
+ /**
* The set of all live rebind request types in the AST.
*/
private final SortedSet<String> rebindRequests;
@@ -110,7 +124,7 @@
/**
* Compiles a particular permutation.
- *
+ *
* @param logger the logger to use
* @param permutation the permutation to compile
* @return the permutation result
@@ -124,8 +138,8 @@
}
/**
- * Return the current AST so that clients can explicitly walk the
- * Java or JavaScript parse trees.
+ * Return the current AST so that clients can explicitly walk the Java or
+ * JavaScript parse trees.
*
* @return the current AST object holding the Java and JavaScript trees.
*/
@@ -146,6 +160,13 @@
}
/**
+ * Returns metrics about the module load portion of the build.
+ */
+ public ModuleMetricsArtifact getModuleMetrics() {
+ return moduleMetrics;
+ }
+
+ /**
* Returns the active set of JJS options associated with this compile.
*/
public JJSOptions getOptions() {
@@ -153,6 +174,13 @@
}
/**
+ * Returns metrics about the precompilation portion of the build.
+ */
+ public PrecompilationMetricsArtifact getPrecompilationMetrics() {
+ return precompilationMetrics;
+ }
+
+ /**
* Returns the set of live rebind requests in the AST.
*/
public SortedSet<String> getRebindRequests() {
@@ -172,6 +200,20 @@
}
/**
+ * Save some module load metrics in the AST.
+ */
+ public void setModuleMetrics(ModuleMetricsArtifact metrics) {
+ this.moduleMetrics = metrics;
+ }
+
+ /**
+ * Save some precompilation metrics in the AST.
+ */
+ public void setPrecompilationMetrics(PrecompilationMetricsArtifact metrics) {
+ this.precompilationMetrics = metrics;
+ }
+
+ /**
* Re-initialize lock object; copy serialized AST straight to cache.
*/
private void readObject(ObjectInputStream stream) throws IOException,
diff --git a/dev/core/src/com/google/gwt/dev/util/arg/ArgHandlerCompileReport.java b/dev/core/src/com/google/gwt/dev/util/arg/ArgHandlerCompileReport.java
index 1e90f0d..0838d4c 100644
--- a/dev/core/src/com/google/gwt/dev/util/arg/ArgHandlerCompileReport.java
+++ b/dev/core/src/com/google/gwt/dev/util/arg/ArgHandlerCompileReport.java
@@ -41,6 +41,7 @@
@Override
public boolean setFlag() {
options.setSoycEnabled(true);
+ options.setCompilerMetricsEnabled(true);
return true;
}
}
diff --git a/dev/core/src/com/google/gwt/dev/util/arg/ArgHandlerCompilerMetrics.java b/dev/core/src/com/google/gwt/dev/util/arg/ArgHandlerCompilerMetrics.java
new file mode 100644
index 0000000..05e74db
--- /dev/null
+++ b/dev/core/src/com/google/gwt/dev/util/arg/ArgHandlerCompilerMetrics.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2010 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.google.gwt.dev.util.arg;
+
+import com.google.gwt.util.tools.ArgHandlerFlag;
+
+/**
+ * An ArgHandler that enables Compiler Metrics.
+ */
+public class ArgHandlerCompilerMetrics extends ArgHandlerFlag {
+
+ private final OptionCompilerMetricsEnabled options;
+
+ public ArgHandlerCompilerMetrics(OptionCompilerMetricsEnabled options) {
+ this.options = options;
+ }
+
+ @Override
+ public String getPurpose() {
+ return "Enable CompilerMetrics";
+ }
+
+ @Override
+ public String getTag() {
+ return "-XcompilerMetrics";
+ }
+
+ @Override
+ public boolean isUndocumented() {
+ return true;
+ }
+
+ @Override
+ public boolean setFlag() {
+ options.setCompilerMetricsEnabled(true);
+ return true;
+ }
+}
diff --git a/dev/core/src/com/google/gwt/dev/util/arg/ArgHandlerSoyc.java b/dev/core/src/com/google/gwt/dev/util/arg/ArgHandlerSoyc.java
index bf6b17c..90951ea 100644
--- a/dev/core/src/com/google/gwt/dev/util/arg/ArgHandlerSoyc.java
+++ b/dev/core/src/com/google/gwt/dev/util/arg/ArgHandlerSoyc.java
@@ -46,6 +46,7 @@
@Override
public boolean setFlag() {
options.setSoycEnabled(true);
+ options.setCompilerMetricsEnabled(true);
return true;
}
}
diff --git a/dev/core/src/com/google/gwt/dev/util/arg/OptionCompilerMetricsEnabled.java b/dev/core/src/com/google/gwt/dev/util/arg/OptionCompilerMetricsEnabled.java
new file mode 100644
index 0000000..f6dfed7
--- /dev/null
+++ b/dev/core/src/com/google/gwt/dev/util/arg/OptionCompilerMetricsEnabled.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2010 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.google.gwt.dev.util.arg;
+
+/**
+ * Option for enabling Compiler Metrics.
+ */
+public interface OptionCompilerMetricsEnabled {
+ boolean isCompilerMetricsEnabled();
+
+ void setCompilerMetricsEnabled(boolean enabled);
+}
diff --git a/dev/core/src/com/google/gwt/dev/util/arg/OptionSoycEnabled.java b/dev/core/src/com/google/gwt/dev/util/arg/OptionSoycEnabled.java
index 3e81c37..937769e 100644
--- a/dev/core/src/com/google/gwt/dev/util/arg/OptionSoycEnabled.java
+++ b/dev/core/src/com/google/gwt/dev/util/arg/OptionSoycEnabled.java
@@ -18,7 +18,7 @@
/**
* Option for enabling Story Of Your Compile data-collection.
*/
-public interface OptionSoycEnabled {
+public interface OptionSoycEnabled extends OptionCompilerMetricsEnabled {
boolean isSoycEnabled();
void setSoycEnabled(boolean enabled);
diff --git a/dev/core/src/com/google/gwt/soyc/CompilerMetricsXmlFormatter.java b/dev/core/src/com/google/gwt/soyc/CompilerMetricsXmlFormatter.java
new file mode 100644
index 0000000..896c88c
--- /dev/null
+++ b/dev/core/src/com/google/gwt/soyc/CompilerMetricsXmlFormatter.java
@@ -0,0 +1,230 @@
+/*
+ * Copyright 2010 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package com.google.gwt.soyc;
+
+import com.google.gwt.core.ext.linker.ArtifactSet;
+import com.google.gwt.core.ext.linker.CompilationMetricsArtifact;
+import com.google.gwt.core.ext.linker.ModuleMetricsArtifact;
+import com.google.gwt.core.ext.linker.PrecompilationMetricsArtifact;
+import com.google.gwt.dev.util.collect.Lists;
+import com.google.gwt.dev.util.collect.Sets;
+
+import java.io.ByteArrayOutputStream;
+import java.io.PrintWriter;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * Exports the compiler metrics gathered by the precompile and
+ * compilePermutation steps into an XML file to be read by external tools.
+ *
+ * See compilerMetrics.xsd for an XML schema describing the output.
+ *
+ * <pre>
+ * <metrics version="1">
+ *
+ * <module elapsed="1234">
+ * <sources count="1">
+ * <source name="foo.java" />
+ * </sources>
+ * <types count="1" kind="initial">
+ * <type name="com.google.foo.Foo" />
+ * </types>
+ * </module>
+ *
+ * <precompilations>
+ * <precompilation base="0" ids="0,1,2" elapsed="1">
+ * <types count="1" kind="generated">
+ * <type name="com.google.foo.Bar" />
+ * </types>
+ * <types count="2" kind="ast">
+ * <type name="com.google.foo.Foo" />
+ * <type name="com.google.foo.Bar" />
+ * </types>
+ * </precompilation>
+ * </precompilations>
+ *
+ * <compilations>
+ * <compilation id="0" elapsed="1" totalElapsed="2" description="foo">
+ * <javascript fragments="1" size="123">
+ * <fragment size="123" initial="true" />
+ * </javascript>
+ * </compilation>
+ * </compilations>
+ *
+ * </metrics>
+ *
+ *</pre>
+ *
+ */
+public class CompilerMetricsXmlFormatter {
+ public static final int XML_FORMAT_VERSION = 1;
+
+ public static byte[] writeMetricsAsXml(ArtifactSet artifacts,
+ ModuleMetricsArtifact moduleMetrics) {
+
+ ByteArrayOutputStream out = new ByteArrayOutputStream();
+ PrintWriter pw = new PrintWriter(out);
+ pw.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
+ pw.append("<metrics version=\"" + XML_FORMAT_VERSION + "\" >\n");
+
+ writeModuleMetricsAsXml(moduleMetrics, pw);
+
+ Set<PrecompilationMetricsArtifact> precompilationMetrics = artifacts.find(PrecompilationMetricsArtifact.class);
+ if (!precompilationMetrics.isEmpty()) {
+ pw.append(" <precompilations>\n");
+ for (PrecompilationMetricsArtifact metrics : precompilationMetrics) {
+ writePrecompilationMetricsAsXml(moduleMetrics, metrics, pw);
+ }
+ pw.append(" </precompilations>\n");
+ }
+
+ Set<CompilationMetricsArtifact> compilationMetrics = artifacts.find(CompilationMetricsArtifact.class);
+ if (!compilationMetrics.isEmpty()) {
+ pw.append(" <compilations>\n");
+ for (CompilationMetricsArtifact metrics : compilationMetrics) {
+ writeCompilationMetricsAsXml(metrics, pw);
+ }
+ pw.append(" </compilations>\n");
+ }
+
+ pw.append("</metrics>\n");
+ pw.close();
+
+ return out.toByteArray();
+ }
+
+ private static String escapeXmlAttributeContent(String content) {
+ String result = content.replaceAll("\'", "'");
+ return result.replaceAll("\"", """);
+ }
+
+ private static void writeCompilationMetricsAsXml(
+ CompilationMetricsArtifact metrics, PrintWriter pw) {
+ pw.append(" <compilation id=\"" + metrics.getPermuationId() + "\" ");
+ pw.append("elapsed=\"" + metrics.getCompileElapsedMilliseconds() + "\" ");
+ pw.append("totalElapsed=\"" + metrics.getElapsedMilliseconds() + "\" ");
+ // TODO(zundel): Print out captured GC and heap memory analysis if it is
+ // available.
+
+ String description = metrics.getPermutationDescription();
+ if (description != null) {
+ pw.append(" description=\"" + escapeXmlAttributeContent(description) + "\"");
+ }
+ pw.append(">\n");
+
+ int[] jsSizes = metrics.getJsSize();
+ if (jsSizes != null) {
+ int totalSize = 0, numFragments = 0;
+ for (int size : jsSizes) {
+ totalSize += size;
+ numFragments++;
+ }
+ pw.append(" <javascript size=\"" + totalSize + "\" fragments=\""
+ + numFragments + "\">\n");
+ boolean initialFragment = true;
+ for (int size : jsSizes) {
+ pw.append(" <fragment ");
+ if (initialFragment) {
+ pw.append("initial=\"true\" ");
+ initialFragment = false;
+ }
+ pw.append("size=\"" + size + "\" />\n");
+ }
+ pw.append(" </javascript>\n");
+ }
+ pw.append(" </compilation>\n");
+ }
+
+ private static void writeModuleMetricsAsXml(ModuleMetricsArtifact metrics,
+ PrintWriter pw) {
+ pw.append(" <module elapsed=\"" + metrics.getElapsedMilliseconds()
+ + "\" ");
+ pw.append(">\n");
+ String[] sourceFiles = metrics.getSourceFiles();
+ if (sourceFiles != null) {
+ Arrays.sort(sourceFiles);
+ pw.append(" <sources count=\"" + sourceFiles.length + "\">\n");
+ for (String sourceFile : sourceFiles) {
+ pw.append(" <source name=\"" + sourceFile + "\" />\n");
+ }
+ pw.append(" </sources>\n");
+ }
+ String[] initialTypes = metrics.getInitialTypes();
+ if (initialTypes != null) {
+ Arrays.sort(initialTypes);
+ pw.append(" <types kind=\"initial\" count=\"" + initialTypes.length
+ + "\">\n");
+ for (String typeName : initialTypes) {
+ pw.append(" <type name=\"" + typeName + "\" />\n");
+ }
+ pw.append(" </types>\n");
+ }
+ pw.append(" </module>\n");
+ }
+
+ private static void writePrecompilationMetricsAsXml(
+ ModuleMetricsArtifact moduleMetrics,
+ PrecompilationMetricsArtifact metrics, PrintWriter pw) {
+ pw.append(" <precompilation ");
+ pw.append("base=\"" + metrics.getPermuationBase() + "\" ");
+ int[] permutationIds = metrics.getPermutationIds();
+ if (permutationIds != null) {
+ StringBuilder builder = new StringBuilder();
+ for (int perm : permutationIds) {
+ builder.append("" + perm + ",");
+ }
+ String idList = builder.substring(0, builder.length() - 1);
+ pw.append("ids=\"" + idList + "\" ");
+ }
+ pw.append("elapsed=\"" + metrics.getElapsedMilliseconds() + "\" ");
+
+ // TODO(zundel): Print out captured GC and heap memory analysis if it is
+ // available.
+ pw.append(">\n");
+ String[] astTypes = metrics.getAstTypes();
+ if (astTypes != null) {
+ Arrays.sort(astTypes);
+ pw.append(" <types kind=\"ast\" count=\"" + astTypes.length + "\">\n");
+ for (String typeName : astTypes) {
+ pw.append(" <type name=\"" + typeName + "\" />\n");
+ }
+ pw.append(" </types>\n");
+ }
+ String[] finalTypeOracleTypes = metrics.getFinalTypeOracleTypes();
+ if (finalTypeOracleTypes != null) {
+ assert finalTypeOracleTypes.length > 0;
+ List<String> initialTypes = Lists.create(moduleMetrics.getInitialTypes());
+ Set<String> generatedTypesList = Sets.create(finalTypeOracleTypes);
+ generatedTypesList.removeAll(initialTypes);
+ String[] generatedTypes = generatedTypesList.toArray(new String[generatedTypesList.size()]);
+ Arrays.sort(generatedTypes);
+ pw.append(" <types kind=\"generated\" count=\"" + generatedTypes.length
+ + "\">\n");
+ for (String typeName : generatedTypes) {
+ pw.append(" <type name=\"" + typeName + "\" />\n");
+ }
+ pw.append(" </types>\n");
+ }
+ pw.append(" </precompilation>\n");
+ }
+
+ private CompilerMetricsXmlFormatter() {
+ // do not instantiate
+ }
+}
diff --git a/dev/core/src/com/google/gwt/soyc/compilerMetrics.xsd b/dev/core/src/com/google/gwt/soyc/compilerMetrics.xsd
new file mode 100644
index 0000000..593cbdb
--- /dev/null
+++ b/dev/core/src/com/google/gwt/soyc/compilerMetrics.xsd
@@ -0,0 +1,288 @@
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+<xsd:annotation>
+ <xsd:documentation>
+ Schema to describe compilerMetrics.xml output from GWT compiler.
+ </xsd:documentation>
+</xsd:annotation>
+
+<!-- root element -->
+
+<xsd:element name="metrics" type="metricsType" />
+
+
+<!-- common element definitions -->
+
+<xsd:simpleType name="permutationIdType">
+ <xsd:annotation>
+ <xsd:documentation>
+ A numeric id that identifies this permutation in the module. Use
+ to correlate precompilation and compilation elements..
+ </xsd:documentation>
+ </xsd:annotation>
+
+ <xsd:restriction base="xsd:nonNegativeInteger" />
+</xsd:simpleType>
+
+<xsd:simpleType name="permutationIdListType">
+ <xsd:annotation>
+ <xsd:documentation>
+ A list of permutations associated with this action.
+ </xsd:documentation>
+ </xsd:annotation>
+
+ <xsd:list itemType="permutationIdType" />
+</xsd:simpleType>
+
+<xsd:complexType name="sourcesType">
+ <xsd:sequence>
+ <xsd:element name="source" type="sourceType"
+ minOccurs="0" maxOccurs="unbounded" />
+ </xsd:sequence>
+
+ <xsd:attribute name="count" type="xsd:nonNegativeInteger" use="required">
+ <xsd:annotation>
+ <xsd:documentation>
+ The number of source files on the source path of the module.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
+</xsd:complexType>
+
+<xsd:complexType name="typeType">
+ <xsd:attribute name="name" type="xsd:string" use="required">
+ <xsd:annotation>
+ <xsd:documentation>
+ The name of a java type (including package name).
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
+</xsd:complexType>
+
+<xsd:complexType name="typesType">
+ <xsd:sequence>
+ <xsd:element name="type" type="typeType"
+ minOccurs="0" maxOccurs="unbounded" />
+ </xsd:sequence>
+
+ <xsd:attribute name="kind" use="required">
+ <xsd:annotation>
+ <xsd:documentation>
+ Describes which view of the type list this represents.
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:simpleType>
+ <xsd:restriction base="xsd:string">
+ <xsd:enumeration value="initial" />
+ <xsd:enumeration value="ast" />
+ <xsd:enumeration value="generated" />
+ </xsd:restriction>
+ </xsd:simpleType>
+ </xsd:attribute>
+
+ <xsd:attribute name="count" type="xsd:nonNegativeInteger" use="required">
+ <xsd:annotation>
+ <xsd:documentation>
+ The number of types created in the initial type oracle build.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
+</xsd:complexType>
+
+
+<!-- precompilationType specific elements -->
+
+<xsd:complexType name="precompilationType">
+ <xsd:annotation>
+ <xsd:documentation>
+ Records a single instance of a precompile task.
+ </xsd:documentation>
+ </xsd:annotation>
+
+ <xsd:sequence>
+ <!-- ast types -->
+ <xsd:element name="types" type="typesType" />
+ <!-- generated types -->
+ <xsd:element name="types" type="typesType" />
+ </xsd:sequence>
+
+ <xsd:attribute name="base" type="permutationIdType" use="required" />
+
+ <xsd:attribute name="ids" type="permutationIdListType" use="required" />
+
+ <xsd:attribute name="elapsed" type="xsd:nonNegativeInteger" use="required">
+ <xsd:annotation>
+ <xsd:documentation>
+ Elapsed time in milliseconds from the start of the compilePerms step
+ until the end of the compilePerms step.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
+</xsd:complexType>
+
+
+<!-- moduleType specific elements -->
+
+<xsd:complexType name="sourceType">
+ <xsd:attribute name="name" type="xsd:string" use="required">
+ <xsd:annotation>
+ <xsd:documentation>
+ The path to a java source file on the GWT moudle source path. This
+ file will be compiled and put it the initial type oracle build.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
+</xsd:complexType>
+
+
+<!-- compilationType specific elements -->
+
+<xsd:complexType name="fragmentType">
+ <xsd:annotation>
+ <xsd:documentation>
+ Represents a fragment of javascript output from the compilePermutations
+ step.
+ </xsd:documentation>
+ </xsd:annotation>
+
+ <xsd:attribute name="initial" type="xsd:boolean">
+ <xsd:annotation>
+ <xsd:documentation>
+ Set to true to indicate that this is the initial fragment of javascript
+ to be downloaded by the app.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
+
+ <xsd:attribute name="size" type="xsd:nonNegativeInteger" use="required">
+ <xsd:annotation>
+ <xsd:documentation>
+ Size of this fragment in bytes (uncompressed).
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
+</xsd:complexType>
+
+<xsd:complexType name="javascriptType">
+ <xsd:annotation>
+ <xsd:documentation>
+ Represents javascript output from the compilePermutations step.
+ </xsd:documentation>
+ </xsd:annotation>
+
+ <xsd:sequence>
+ <xsd:element name="fragment" type="fragmentType"
+ minOccurs="0" maxOccurs="unbounded" />
+ </xsd:sequence>
+
+ <xsd:attribute name="size" type="xsd:nonNegativeInteger" use="required">
+ <xsd:annotation>
+ <xsd:documentation>
+ Size of all fragments output in bytes (uncompressed).
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
+
+ <xsd:attribute name="fragments" type="xsd:positiveInteger" use="required">
+ <xsd:annotation>
+ <xsd:documentation>
+ The number of javascript fragments output.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
+</xsd:complexType>
+
+<xsd:complexType name="compilationType">
+ <xsd:annotation>
+ <xsd:documentation>
+ Records a single instance of a compilePermutations task.
+ </xsd:documentation>
+ </xsd:annotation>
+
+ <xsd:sequence>
+ <xsd:element name="javascript" type="javascriptType"
+ minOccurs="0" maxOccurs="unbounded" />
+ </xsd:sequence>
+
+ <xsd:attribute name="id" type="permutationIdType" use="required" />
+
+ <xsd:attribute name="elapsed" type="xsd:nonNegativeInteger" use="required">
+ <xsd:annotation>
+ <xsd:documentation>
+ Elapsed time in millesconds from the start of the compilePerms step
+ until the end of the compilePerms step.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
+
+ <xsd:attribute name="totalElapsed" type="xsd:nonNegativeInteger"
+ use="required">
+ <xsd:annotation>
+ <xsd:documentation>
+ Elapsed time in millesconds from the start of the JVM execution
+ until the end of the compilePerms step.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
+
+ <xsd:attribute name="description" type="xsd:string" use="required">
+ <xsd:annotation>
+ <xsd:documentation>
+ Human readable string describing the permutation being compiled.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
+</xsd:complexType>
+
+
+<!-- top level element definition -->
+
+<xsd:complexType name="moduleType">
+ <xsd:sequence>
+ <xsd:element name="sources" type="sourcesType" />
+ <xsd:element name="types" type="typesType" />
+ </xsd:sequence>
+
+ <xsd:attribute name="elapsed" type="xsd:nonNegativeInteger" use="required">
+ <xsd:annotation>
+ <xsd:documentation>
+ Elapsed time in millesconds from the start of the JVM execution
+ until the finish of building the initial type oracle typs.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
+</xsd:complexType>
+
+<xsd:complexType name="precompilationsType">
+ <xsd:sequence>
+ <xsd:element name="precompilation" type="precompilationType"
+ minOccurs="0" maxOccurs="unbounded" />
+ </xsd:sequence>
+</xsd:complexType>
+
+<xsd:complexType name="compilationsType">
+ <xsd:sequence>
+ <xsd:element name="compilation" type="compilationType"
+ minOccurs="0" maxOccurs="unbounded" />
+ </xsd:sequence>
+</xsd:complexType>
+
+<!-- root element definition -->
+
+<xsd:complexType name="metricsType">
+ <xsd:sequence>
+ <xsd:element name="module" type="moduleType" />
+ <xsd:element name="precompilations" type="precompilationsType" />
+ <xsd:element name="compilations" type="compilationsType" />
+ </xsd:sequence>
+
+ <xsd:attribute name="version" type="xsd:positiveInteger" use="required">
+ <xsd:annotation>
+ <xsd:documentation>
+ A version number for the compilerMetics.xml file format.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
+</xsd:complexType>
+
+</xsd:schema>
+
