Renamed benchmark plugin again and other minor fixes #2

IncQueryLabs · Aug 10, 2017 · bd3a8b5 · bd3a8b5
1 parent fc89834
commit bd3a8b5
Show file tree

Hide file tree

Showing 35 changed files with 56 additions and 58 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -35,7 +35,7 @@ pipeline {
 
     post {
     	always {
-    		archiveArtifacts 'com.incquerylabs.instaschema.performance/results/**, benchmark/**'
+    		archiveArtifacts 'com.incquerylabs.magicdraw.benchmark/results/**, benchmark/**'
     	}
         success {
             slackSend channel: "magicdraw-notificatio", 

diff --git a/MagicDraw with all plugins/META-INF/MANIFEST.MF b/MagicDraw with all plugins/META-INF/MANIFEST.MF
@@ -21,6 +21,6 @@ Require-Bundle: org.eclipse.viatra.query.runtime,
  org.eclipse.viatra.transformation.runtime.emf,
  org.eclipse.xtext.xbase.lib,
  eu.mondo.sam.bundle;bundle-version="0.1.0",
- com.incquerylabs.instaschema.performance;bundle-version="1.0.0"
+ com.incquerylabs.magicdraw.benchmark;bundle-version="1.0.0"
 Import-Package: org.apache.log4j
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/benchmark/convert_results.sh b/benchmark/convert_results.sh
@@ -5,7 +5,7 @@ cd "$( cd "$( dirname "$0" )" && pwd )"
 rm -rf ${WORKSPACE}/benchmark/results
 mkdir ${WORKSPACE}/benchmark/results
 
-cd ${WORKSPACE}/com.incquerylabs.instaschema.performance/results
+cd ${WORKSPACE}/com.incquerylabs.magicdraw.benchmark/results
 
 for i in $(ls -d */); do
   echo ${i};
@@ -15,7 +15,7 @@ for i in $(ls -d */); do
   else
     echo "PROCESS"
 	mkdir ${WORKSPACE}/benchmark/results/${i}
-	python3 ${WORKSPACE}/mondo-sam/reporting/convert_results.py --source ${WORKSPACE}/com.incquerylabs.instaschema.performance/results/${i} \
+	python3 ${WORKSPACE}/mondo-sam/reporting/convert_results.py --source ${WORKSPACE}/com.incquerylabs.magicdraw.benchmark/results/${i} \
 --jsonfile ${WORKSPACE}/benchmark/results/${i}results.json \
 --csvfile ${WORKSPACE}/benchmark/results/${i}results.csv
   fi

diff --git a/...labs.instaschema.performance/src/com/incquerylabs/instaschema/performance/EngineImpl.java b/...labs.instaschema.performance/src/com/incquerylabs/instaschema/performance/EngineImpl.java
diff --git a/...rylabs.instaschema.performance/.classpath → ...cquerylabs.magicdraw.benchmark/.classpath b/...rylabs.instaschema.performance/.classpath → ...cquerylabs.magicdraw.benchmark/.classpath
diff --git a/...rylabs.instaschema.performance/.gitignore → ...cquerylabs.magicdraw.benchmark/.gitignore b/...rylabs.instaschema.performance/.gitignore → ...cquerylabs.magicdraw.benchmark/.gitignore
diff --git a/...uerylabs.instaschema.performance/.project → ...incquerylabs.magicdraw.benchmark/.project b/...uerylabs.instaschema.performance/.project → ...incquerylabs.magicdraw.benchmark/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>com.incquerylabs.instaschema.performance</name>
+	<name>com.incquerylabs.magicdraw.benchmark</name>
 	<comment></comment>
 	<projects>
 	</projects>

diff --git a/...settings/org.eclipse.core.resources.prefs → ...settings/org.eclipse.core.resources.prefs b/...settings/org.eclipse.core.resources.prefs → ...settings/org.eclipse.core.resources.prefs
diff --git a/...ance/.settings/org.eclipse.jdt.core.prefs → ...mark/.settings/org.eclipse.jdt.core.prefs b/...ance/.settings/org.eclipse.jdt.core.prefs → ...mark/.settings/org.eclipse.jdt.core.prefs
diff --git a/...ternlanguage.emf.EMFPatternLanguage.prefs → ...ternlanguage.emf.EMFPatternLanguage.prefs b/...ternlanguage.emf.EMFPatternLanguage.prefs → ...ternlanguage.emf.EMFPatternLanguage.prefs
diff --git a/...taschema.performance/META-INF/MANIFEST.MF → ....magicdraw.benchmark/META-INF/MANIFEST.MF b/...taschema.performance/META-INF/MANIFEST.MF → ....magicdraw.benchmark/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Validation
-Bundle-SymbolicName: com.incquerylabs.instaschema.performance;singleton:=true
+Bundle-SymbolicName: com.incquerylabs.magicdraw.benchmark;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-ClassPath: .
-Export-Package: com.incquerylabs.instaschema.performance
+Export-Package: com.incquerylabs.magicdraw.benchmark
 Require-Bundle: org.eclipse.viatra.query.runtime;bundle-version="1.6.0",
  org.eclipse.viatra.transformation.runtime.emf;bundle-version="1.6.0",
  com.nomagic.magicdraw;bundle-version="17.0.5",

diff --git a/...taschema.performance/Run Benchmark.launch → ....magicdraw.benchmark/Run Benchmark.launch b/...taschema.performance/Run Benchmark.launch → ....magicdraw.benchmark/Run Benchmark.launch
diff --git a/....instaschema.performance/build.properties → ...labs.magicdraw.benchmark/build.properties b/....instaschema.performance/build.properties → ...labs.magicdraw.benchmark/build.properties
diff --git a/...rylabs.instaschema.performance/plugin.xml → ...cquerylabs.magicdraw.benchmark/plugin.xml b/...rylabs.instaschema.performance/plugin.xml → ...cquerylabs.magicdraw.benchmark/plugin.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin 
-	class="com.incquerylabs.instaschema.performance.InstaSchemaPerformancePlugin" 
+	class="com.incquerylabs.magicdraw.benchmark.PerformanceBenchmarkRunner" 
 	class-lookup="GlobalFirst" 
-	id="com.incquerylabs.instaschema.performance" 
+	id="com.incquerylabs.magicdraw.benchmark" 
 	name="VIATRA Query Benchmark Performance" 
 	provider-name="IncQuery Labs ltd." 
 	version="1.0"

diff --git a/...querylabs.instaschema.performance/pom.xml → com.incquerylabs.magicdraw.benchmark/pom.xml b/...querylabs.instaschema.performance/pom.xml → com.incquerylabs.magicdraw.benchmark/pom.xml
@@ -10,7 +10,6 @@
 
 
 	<groupId>com.incquerylabs.magicdraw</groupId>
-	<artifactId>benchmark.performance</artifactId>
 	<version>1.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
@@ -460,4 +459,5 @@
 		</dependency>
 
 	</dependencies>
+	<artifactId>com.incquerylabs.instaschema.performance</artifactId>
 </project>
diff --git a/...nstaschema.performance/results/.gitignore → ...bs.magicdraw.benchmark/results/.gitignore b/...nstaschema.performance/results/.gitignore → ...bs.magicdraw.benchmark/results/.gitignore
diff --git a/...cquerylabs.instaschema.performance/run.sh → com.incquerylabs.magicdraw.benchmark/run.sh b/...cquerylabs.instaschema.performance/run.sh → com.incquerylabs.magicdraw.benchmark/run.sh
@@ -86,7 +86,7 @@ do
 					-Dlogback.configurationFile="$MD_HOME/data/logback.xml" \
 					-Dmd.plugins.dir="$MD_HOME/plugins${cp_delim}target/plugin-release/files/plugins${cp_delim}../com.incquerylabs.benchmark.performance/target/plugin-release/files/plugins" \
 					-Dcom.nomagic.magicdraw.launcher=com.nomagic.magicdraw.commandline.CommandLineActionLauncher \
-					-Dcom.nomagic.magicdraw.commandline.action=com.incquerylabs.instaschema.performance.benchmark.PerformanceBenchmarkRunner \
+					-Dcom.nomagic.magicdraw.commandline.action=com.incquerylabs.magicdraw.benchmark.PerformanceBenchmarkRunner \
 					-cp "$CP" \
 					com.nomagic.osgi.launcher.ProductionFrameworkLauncher "$@ -engine $engine -query $query -index $runIndex -size $size -model '${MD_HOME}/performance/inputs/TMT$size.mdzip' -warmup '${MD_HOME}/performance/inputs/Warmup.mdzip' -output '${OUTPUT_DIR}'"
 			done

diff --git a/...nstaschema.performance/src-gen/.gitignore → ...bs.magicdraw.benchmark/src-gen/.gitignore b/...nstaschema.performance/src-gen/.gitignore → ...bs.magicdraw.benchmark/src-gen/.gitignore
diff --git a/...rformance/benchmark/BackendSelection.java → ...magicdraw/benchmark/BackendSelection.java b/...rformance/benchmark/BackendSelection.java → ...magicdraw/benchmark/BackendSelection.java
@@ -1,4 +1,4 @@
-package com.incquerylabs.instaschema.performance.benchmark;
+package com.incquerylabs.magicdraw.benchmark;
 
 import java.util.Objects;
 
@@ -13,12 +13,11 @@
 import org.eclipse.viatra.query.runtime.matchers.psystem.PConstraint;
 import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PQuery;
 
-import com.incquerylabs.instaschema.performance.EngineImpl;
-import com.incquerylabs.instaschema.performance.incrementalqueries.IncrementalQueries;
-import com.incquerylabs.instaschema.performance.incrementalqueries.util.ParentStateQuerySpecification;
-import com.incquerylabs.instaschema.performance.queries.APerformanceQueries;
-import com.incquerylabs.instaschema.performance.queries.util.IncomingTransitionsQuerySpecification;
-import com.incquerylabs.instaschema.performance.queries.util.TransitiveSubstatesWithCheck3QuerySpecification;
+import com.incquerylabs.magicdraw.benchmark.incrementalqueries.IncrementalQueries;
+import com.incquerylabs.magicdraw.benchmark.incrementalqueries.util.ParentStateQuerySpecification;
+import com.incquerylabs.magicdraw.benchmark.queries.APerformanceQueries;
+import com.incquerylabs.magicdraw.benchmark.queries.util.IncomingTransitionsQuerySpecification;
+import com.incquerylabs.magicdraw.benchmark.queries.util.TransitiveSubstatesWithCheck3QuerySpecification;
 
 public enum BackendSelection {
 

diff --git a/...rmance/benchmark/BenchmarkParameters.java → ...icdraw/benchmark/BenchmarkParameters.java b/...rmance/benchmark/BenchmarkParameters.java → ...icdraw/benchmark/BenchmarkParameters.java
@@ -1,4 +1,4 @@
-package com.incquerylabs.instaschema.performance.benchmark;
+package com.incquerylabs.magicdraw.benchmark;
 
 import java.io.File;
 import java.util.Objects;

diff --git a/...incquerylabs.magicdraw.benchmark/src/com/incquerylabs/magicdraw/benchmark/EngineImpl.java b/...incquerylabs.magicdraw.benchmark/src/com/incquerylabs/magicdraw/benchmark/EngineImpl.java
@@ -0,0 +1,5 @@
+package com.incquerylabs.magicdraw.benchmark;
+
+public enum EngineImpl {
+	RETE, LOCAL_SEARCH
+}
diff --git a/...ormance/InstaSchemaPerformancePlugin.java → ...nchmark/InstaSchemaPerformancePlugin.java b/...ormance/InstaSchemaPerformancePlugin.java → ...nchmark/InstaSchemaPerformancePlugin.java
@@ -1,4 +1,4 @@
-package com.incquerylabs.instaschema.performance;
+package com.incquerylabs.magicdraw.benchmark;
 
 import java.awt.event.ActionEvent;
 import java.io.File;
@@ -51,11 +51,10 @@
 import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
 
 import com.google.common.base.Stopwatch;
-import com.incquerylabs.instaschema.performance.benchmark.PerformanceBenchmarkRunner;
-import com.incquerylabs.instaschema.performance.incrementalqueries.IncrementalQueries;
-import com.incquerylabs.instaschema.performance.queries.APerformanceQueries;
-import com.incquerylabs.instaschema.performance.queries.WarmUpQueries;
-import com.incquerylabs.instaschema.performance.queries.util.TransitiveSubstatesWithCheck3QuerySpecification;
+import com.incquerylabs.magicdraw.benchmark.incrementalqueries.IncrementalQueries;
+import com.incquerylabs.magicdraw.benchmark.queries.APerformanceQueries;
+import com.incquerylabs.magicdraw.benchmark.queries.WarmUpQueries;
+import com.incquerylabs.magicdraw.benchmark.queries.util.TransitiveSubstatesWithCheck3QuerySpecification;
 import com.nomagic.actions.AMConfigurator;
 import com.nomagic.actions.ActionsManager;
 import com.nomagic.magicdraw.actions.ActionsConfiguratorsManager;

diff --git a/...taschema/performance/MeasurementData.java → .../magicdraw/benchmark/MeasurementData.java b/...taschema/performance/MeasurementData.java → .../magicdraw/benchmark/MeasurementData.java
@@ -1,4 +1,4 @@
-package com.incquerylabs.instaschema.performance;
+package com.incquerylabs.magicdraw.benchmark;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/...performance/benchmark/MondoSamRunner.java → ...s/magicdraw/benchmark/MondoSamRunner.java b/...performance/benchmark/MondoSamRunner.java → ...s/magicdraw/benchmark/MondoSamRunner.java
@@ -1,11 +1,11 @@
-package com.incquerylabs.instaschema.performance.benchmark;
+package com.incquerylabs.magicdraw.benchmark;
 
 import java.io.File;
 
 import org.eclipse.viatra.query.runtime.api.IQuerySpecification;
 
-import com.incquerylabs.instaschema.mondo.sam.QueryMatcherToken;
-import com.incquerylabs.instaschema.mondo.sam.SingleQueryScenario;
+import com.incquerylabs.magicdraw.benchmark.mondo.sam.QueryMatcherToken;
+import com.incquerylabs.magicdraw.benchmark.mondo.sam.SingleQueryScenario;
 import com.nomagic.magicdraw.core.Application;
 import com.nomagic.magicdraw.core.project.ProjectDescriptor;
 import com.nomagic.magicdraw.core.project.ProjectDescriptorsFactory;

diff --git a/...benchmark/PerformanceBenchmarkRunner.java → ...benchmark/PerformanceBenchmarkRunner.java b/...benchmark/PerformanceBenchmarkRunner.java → ...benchmark/PerformanceBenchmarkRunner.java
@@ -1,4 +1,4 @@
-package com.incquerylabs.instaschema.performance.benchmark;
+package com.incquerylabs.magicdraw.benchmark;
 
 import java.io.File;
 import java.io.IOException;

diff --git a/...incrementalqueries/IncrementalQueries.vql → ...incrementalqueries/IncrementalQueries.vql b/...incrementalqueries/IncrementalQueries.vql → ...incrementalqueries/IncrementalQueries.vql
@@ -1,9 +1,9 @@
-package com.incquerylabs.instaschema.performance.incrementalqueries
+package com.incquerylabs.magicdraw.benchmark.incrementalqueries
 
 import "http://www.nomagic.com/magicdraw/UML/2.5.0"
-import com.incquerylabs.instaschema.performance.queries.statesWithShortNames
-import com.incquerylabs.instaschema.performance.queries.incomingTransitions
-import com.incquerylabs.instaschema.performance.queries.statesWithMoreIncomingTransitions
+import com.incquerylabs.magicdraw.benchmark.queries.statesWithShortNames
+import com.incquerylabs.magicdraw.benchmark.queries.incomingTransitions
+import com.incquerylabs.magicdraw.benchmark.queries.statesWithMoreIncomingTransitions
 
 /**
  * Simple pattern for transitive closures marked incremental.

diff --git a/...abs/instaschema/mondo/sam/InitPhase.xtend → ...cdraw/benchmark/mondo/sam/InitPhase.xtend b/...abs/instaschema/mondo/sam/InitPhase.xtend → ...cdraw/benchmark/mondo/sam/InitPhase.xtend
@@ -1,4 +1,4 @@
-package com.incquerylabs.instaschema.mondo.sam
+package com.incquerylabs.magicdraw.benchmark.mondo.sam
 
 import eu.mondo.sam.core.DataToken
 import eu.mondo.sam.core.phases.AtomicPhase

diff --git a/...taschema/mondo/sam/MatcherInitPhase.xtend → ...enchmark/mondo/sam/MatcherInitPhase.xtend b/...taschema/mondo/sam/MatcherInitPhase.xtend → ...enchmark/mondo/sam/MatcherInitPhase.xtend
@@ -1,4 +1,4 @@
-package com.incquerylabs.instaschema.mondo.sam
+package com.incquerylabs.magicdraw.benchmark.mondo.sam
 
 import com.google.common.collect.ImmutableSet
 import eu.mondo.sam.core.DataToken

diff --git a/...aschema/mondo/sam/QueryMatcherToken.xtend → ...nchmark/mondo/sam/QueryMatcherToken.xtend b/...aschema/mondo/sam/QueryMatcherToken.xtend → ...nchmark/mondo/sam/QueryMatcherToken.xtend
@@ -1,4 +1,4 @@
-package com.incquerylabs.instaschema.mondo.sam
+package com.incquerylabs.magicdraw.benchmark.mondo.sam
 
 import eu.mondo.sam.core.DataToken
 import org.eclipse.emf.ecore.EReference

diff --git a/...a/mondo/sam/ResultSetRetrievalPhase.xtend → ...k/mondo/sam/ResultSetRetrievalPhase.xtend b/...a/mondo/sam/ResultSetRetrievalPhase.xtend → ...k/mondo/sam/ResultSetRetrievalPhase.xtend
@@ -1,4 +1,4 @@
-package com.incquerylabs.instaschema.mondo.sam
+package com.incquerylabs.magicdraw.benchmark.mondo.sam
 
 import eu.mondo.sam.core.DataToken
 import eu.mondo.sam.core.metrics.ScalarMetric
@@ -17,17 +17,17 @@ class ResultSetRetrievalPhase extends AtomicPhase {
 	}
 
 	override execute(DataToken token, PhaseResult phaseResult) {
-		val logger = Logger.getLogger("org.eclipse.viatra.query");
+		val logger = Logger.getLogger("com.incquerylabs.magicdraw.benchmark");
 		val myToken = token as QueryMatcherToken
 
 		// Time and memory are measured
 		val timer = new TimeMetric("Time")
 
-//		val queryBackend = myToken.engine.getQueryBackend(LocalSearchBackendFactory.INSTANCE)
-//		val profiler = new LocalSearchProfilerAdapter()
-//		if(queryBackend instanceof LocalSearchBackend){
-//			queryBackend.addAdapter(profiler)	
-//		}
+		val queryBackend = myToken.engine.getQueryBackend(LocalSearchBackendFactory.INSTANCE)
+		val profiler = new LocalSearchProfilerAdapter()
+		if(queryBackend instanceof LocalSearchBackend){
+			queryBackend.addAdapter(profiler)	
+		}
 
 
 		timer.startMeasure
@@ -41,9 +41,9 @@ class ResultSetRetrievalPhase extends AtomicPhase {
 
 		phaseResult.addMetrics(timer, matchSetSize)
 
-//		if(queryBackend instanceof LocalSearchBackend){
-//			logger.info(profiler)
-//		}		
+		if(queryBackend instanceof LocalSearchBackend){
+			logger.info(profiler)
+} 		
 	}	
 
 }
diff --git a/...chema/mondo/sam/SingleQueryScenario.xtend → ...hmark/mondo/sam/SingleQueryScenario.xtend b/...chema/mondo/sam/SingleQueryScenario.xtend → ...hmark/mondo/sam/SingleQueryScenario.xtend
@@ -1,6 +1,6 @@
-package com.incquerylabs.instaschema.mondo.sam
+package com.incquerylabs.magicdraw.benchmark.mondo.sam
 
-import com.incquerylabs.instaschema.performance.EngineImpl
+import com.incquerylabs.magicdraw.benchmark.EngineImpl
 import eu.mondo.sam.core.phases.SequencePhase
 import eu.mondo.sam.core.results.CaseDescriptor
 import eu.mondo.sam.core.scenarios.BenchmarkScenario
@@ -51,7 +51,7 @@ class SingleQueryScenario extends BenchmarkScenario {
 			it.size = this.size
 			it.runIndex = this.runIndex
 			it.scenario = this.getName
-			it.tool = this.getToolName
+			it.tool = this.toolName
 		]
 		return descriptor
 	}

diff --git a/...rformance/queries/APerformanceQueries.vql → ...benchmark/queries/APerformanceQueries.vql b/...rformance/queries/APerformanceQueries.vql → ...benchmark/queries/APerformanceQueries.vql
@@ -1,4 +1,4 @@
-package com.incquerylabs.instaschema.performance.queries
+package com.incquerylabs.magicdraw.benchmark.queries
 
 import "http://www.nomagic.com/magicdraw/UML/2.5.0"
 

diff --git a/...ema/performance/queries/WarmUpQueries.vql → ...cdraw/benchmark/queries/WarmUpQueries.vql b/...ema/performance/queries/WarmUpQueries.vql → ...cdraw/benchmark/queries/WarmUpQueries.vql
@@ -1,4 +1,4 @@
-package com.incquerylabs.instaschema.performance.queries
+package com.incquerylabs.magicdraw.benchmark.queries
 
 import "http://www.nomagic.com/magicdraw/UML/2.5.0"
 

diff --git a/...taschema.performance/xtend-gen/.gitignore → ....magicdraw.benchmark/xtend-gen/.gitignore b/...taschema.performance/xtend-gen/.gitignore → ....magicdraw.benchmark/xtend-gen/.gitignore
diff --git a/pom.xml b/pom.xml
@@ -22,7 +22,7 @@
 	</properties>
 
 	<modules>
-		<module>com.incquerylabs.instaschema.performance</module>
+		<module>com.incquerylabs.magicdraw.benchmark</module>
 
 		<module>com.incquerylabs.benchmark.generator</module>
 	</modules>