Skip to content
This repository was archived by the owner on Jan 12, 2024. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
115 commits
Select commit Hold shift + click to select a range
4bd5bc1
Merging dbw8/sim into Feature branch (#246)
swernli Jun 10, 2020
258bc3d
Adding AVX512 to simulator (#255)
swernli Jun 16, 2020
e32e0b2
Initial wfn permute changes
Jun 16, 2020
f48134e
changes to reorder to fix minor bugs
Jun 16, 2020
3281075
rebase with clean sim branch
Jun 17, 2020
8abf1e1
Merge branch 'feature/simulator-enhancement' into swernli/update
swernli Jun 23, 2020
99bb731
Merge pull request #280 from microsoft/swernli/update
swernli Jun 23, 2020
d3644f5
Merging Linux simulator update from dbwz8/simDbg (#281)
swernli Jun 23, 2020
c3189fb
Reordering wfn to work with existing flush/fuse logic
Jun 25, 2020
4beea14
resolving conflicts
Jun 25, 2020
d6b2ca2
Added some comments
Jul 1, 2020
91eef28
Merge branch 'master' of https://github.com/microsoft/qsharp-runtime …
Jul 1, 2020
e723e29
Merge branch 'master' into beheim/updatesFromMaster
Jul 1, 2020
b9af6c9
Merge pull request #292 from microsoft/beheim/updatesFromMaster
bettinaheim Jul 1, 2020
945fb33
Merge branch 'feature/simulator-enhancement' of https://github.com/mi…
Jul 1, 2020
1c4b977
Combining Dave's scheduling logic with reordering
Jul 3, 2020
97bd17c
PR changes
Jul 22, 2020
1c4b04f
PR changes
Jul 22, 2020
dda8591
Creating cleaner scheduler branch
Jul 22, 2020
6e02ec9
Creating cleaner scheduler branch
Jul 22, 2020
f72901f
Creating cleaner scheduler branch
Jul 22, 2020
9aa1328
Creating cleaner scheduler branch
Jul 22, 2020
9b0ffe5
Creating cleaner scheduler branch
Jul 22, 2020
db57a03
Creating cleaner scheduler branch
Jul 22, 2020
c38115a
Creating cleaner scheduler branch
Jul 22, 2020
4e15bff
Creating cleaner scheduler branch
Jul 22, 2020
68935df
Creating cleaner scheduler branch
Jul 22, 2020
4455693
Creating cleaner scheduler branch
Jul 23, 2020
07bbb87
PR changes
Jul 25, 2020
70192a8
Merge from t-anikda/experimental
Jul 27, 2020
38696fd
Commiting further merge changes
Jul 27, 2020
95365f3
New re-ordering routine in clean branch
Jul 27, 2020
7268db1
New re-ordering routine in clean branch
Jul 28, 2020
d91fab3
PR change to avoid copying
Jul 28, 2020
8f3c963
PR changes
Jul 28, 2020
bcb37db
PR changes to undo character change in Haner
Jul 28, 2020
3747e5a
Merge changes
Jul 28, 2020
781b1b8
cleaning branch for PR
Jul 31, 2020
289eba4
Adding heuristic for reorder
Aug 6, 2020
5f40ec3
Merge remote-tracking branch 'origin/master' into swernli/aniket-opti…
swernli Aug 14, 2020
c70f91c
Base branch with @@@DBG+ marking debugging lines
Aug 14, 2020
23745c5
.
Aug 14, 2020
e7a891b
.
Aug 14, 2020
89d1872
Merged all 3 branches and got them working.
Aug 15, 2020
4b675c7
Working on cluster code.
Aug 15, 2020
61883f0
Code appears to be working. Now starting on performance
Aug 17, 2020
4e23c8d
About to run benchmarks
Aug 18, 2020
244516f
Linux vararg changes
Aug 18, 2020
16a58d0
Setting up for benchmarks
Aug 18, 2020
e844740
Optimizing scheduler
Aug 18, 2020
5bd5720
Fixed scheduling ordering bugs
Aug 18, 2020
c16a7f5
.
Aug 18, 2020
cf289a7
.
Aug 18, 2020
a2d2383
reordered tests
Aug 18, 2020
547b36d
Doing tests
Aug 19, 2020
c788f57
more tests
Aug 19, 2020
d0dafe4
All benchmarks run. This is a frozen version
Aug 19, 2020
1fd141a
Fixed problems with cluster ordering. Now passes all tests.
Aug 19, 2020
ec359d9
Made a clean version via #define DBWDBG
Aug 19, 2020
e8ff840
Sample local project
anpaz Aug 20, 2020
2de3fe5
Added 4x4 supremecy test
Aug 20, 2020
fa99475
Added top level benchmark (Sample) and tuned optimal number of thread…
Aug 20, 2020
0c170be
Made dbw_test work in the real builds
Aug 21, 2020
1e62dcc
comment update
Aug 21, 2020
685c6f8
Working on dbw_test from product testing
Aug 21, 2020
56f0246
.
Aug 21, 2020
0a95339
Got rid of checked in executable
Aug 21, 2020
8a64cbf
Added 5x6 test
Aug 21, 2020
259579e
Trying to get one e2e sample to work
Aug 22, 2020
c7d1ecf
e2e tests working on Linux
Aug 22, 2020
c3d2a6b
Moved all the benchmark code into one place.
Aug 23, 2020
50e7c32
Unifying supremacy tests
Aug 23, 2020
bdf3882
Cleaning up tree
Aug 23, 2020
419d9ca
.
Aug 23, 2020
9a37885
.
Aug 23, 2020
3fbf783
.
Aug 23, 2020
393bf81
Cleaning everything up
Aug 23, 2020
31f3f6a
Stable version
Aug 23, 2020
9ef5e8f
Working on normalizing code
Aug 24, 2020
1d034f3
git rid of editor file
Aug 24, 2020
9ba9888
Adding environment variable controls
Aug 24, 2020
2175292
Added runTest.sh
Aug 24, 2020
02581d6
More testing harness
Aug 24, 2020
5c365dd
.
Aug 25, 2020
8efe5ff
Added Linux strlen for env vars
Aug 25, 2020
5d75c3a
.
Aug 25, 2020
3b8cef7
Herlper parseLog.py created
Aug 25, 2020
4ac6187
Put in better defaults for env var values.
Aug 26, 2020
5bed64b
Put in better env var defaults
Aug 26, 2020
b10babf
Testing
Aug 26, 2020
5c2973a
Debugging
Aug 26, 2020
2d18536
Working version
Aug 26, 2020
11e2140
Put in limit on maxFusedSpan
Aug 26, 2020
422061a
Deleted unreferenced variables
Aug 26, 2020
093ee38
Fixing qubit gate mapping and flush on release
swernli Aug 27, 2020
6e12165
Minor cleanup
swernli Aug 27, 2020
48fa9ac
Getting dbw_test to play nice with test.ps1
swernli Aug 27, 2020
b518106
Merge remote-tracking branch 'origin/master' into swernli/simulator-e…
swernli Aug 27, 2020
eedfd9b
Use backslash to support cross-platform filepath
swernli Aug 27, 2020
67dafdc
Remove DBWDBG and temp logs. Rename supremacy to advantage
Aug 27, 2020
42e7e3c
Updating files for pull request
Aug 27, 2020
68c5f9b
Renaming supremacy files
Aug 27, 2020
a8ebf6b
Replaced supremXX with advantageXX
Aug 27, 2020
cd67b8f
rm unused log files. Fixed a few compiler warns
Aug 27, 2020
64a2e14
Working on build problem
Aug 27, 2020
22bceb6
Fixing build, cleaning up last DBG statements
swernli Aug 27, 2020
71bd199
Merge pull request #362 from microsoft/swernli/simulator-enhancement2
swernli Aug 27, 2020
790c576
Fix wavefunction pop_back bug
swernli Aug 30, 2020
98cf3fa
Removing unused wavefunction utilities
swernli Aug 30, 2020
1b0e5f2
Benchmark should not assume default 6
swernli Aug 30, 2020
f740cae
Remove commented out Flush
swernli Aug 30, 2020
7651e18
Show native test output
swernli Aug 30, 2020
e68ec0c
Set failure thresholds for dbw_test benchmark
swernli Aug 30, 2020
84e88d4
Merge branch 'master' into swernli/simulator-enhancement
swernli Aug 30, 2020
ba1825b
Adding AdvantageBenchmark readme
swernli Aug 31, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -337,3 +337,4 @@ ASALocalRun/
.mfractor/
/src/Simulation/Simulators.Tests/TestProjects/QsharpExe/built
/src/Simulation/Simulators.Tests/TestProjects/TargetedExe/built
dbw_test
4 changes: 4 additions & 0 deletions AdvantageBenchmark/privateBuild/.editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[*.cs]

# SA1025: Code should not contain multiple whitespace in a row
dotnet_diagnostic.SA1025.severity = none
71 changes: 71 additions & 0 deletions AdvantageBenchmark/privateBuild/Program.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
namespace quantum
{
using System;
using System.Diagnostics;
using Microsoft.Quantum.Simulation.Simulators;

class Program
{
public static void Main(string[] args)
{
Console.WriteLine($"CSV,test,loop,secs,gates,THREADS,FUSESPAN,FUSEDEPTH,Gates/sec");
var envThr = System.Environment.GetEnvironmentVariable("OMP_NUM_THREADS");
var envFus = System.Environment.GetEnvironmentVariable("QDK_SIM_FUSESPAN");
var envDep = System.Environment.GetEnvironmentVariable("QDK_SIM_FUSEDEPTH");
if (envThr == null || envThr.Length == 0) envThr = "Default";
if (envFus == null || envFus.Length == 0) envFus = "Default";
if (envDep == null || envDep.Length == 0) envDep = "99";

int tstMin = 0;
int tstMax = 3;
int loopCnt = 10;

if (args.Length > 0) tstMin = Convert.ToInt32(args[0]);
if (args.Length > 1) tstMax = Convert.ToInt32(args[1]);
if (args.Length > 2) loopCnt = Convert.ToInt32(args[2]);

using (var sim = new QuantumSimulator())
{
long gates = 1;
TimeSpan ts;
double tSecs;
double gps;
string tstName = "";
Stopwatch stopWatch = new Stopwatch();

for (int tst = tstMin; tst <= tstMax; tst++)
{
for (int loop = 0; loop < loopCnt; loop++)
{
stopWatch.Restart();
switch (tst)
{
case 0:
gates = Dummy.Run(sim).Result;
tstName = "Dummy";
break;
case 1:
gates = Advantage44.Run(sim).Result;
tstName = "4x4";
break;
case 2:
gates = Advantage55.Run(sim).Result;
tstName = "5x5";
break;
case 3:
gates = Advantage56.Run(sim).Result;
tstName = "5x6";
break;
}
stopWatch.Stop();
ts = stopWatch.Elapsed;
tSecs = ts.TotalSeconds;
gps = gates / tSecs;

Console.WriteLine($"CSV,{tstName},{loop:D2},{tSecs:F2},{gates:E2},{envThr},{envFus},{envDep},{gps:E2}");
}
}
}
}
}
}
Loading