Skip to content

Scale tests fixes #6664

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 9, 2017
Merged

Scale tests fixes #6664

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b9570ee
scale-test: Fix a typo
slavapestov Jan 9, 2017
95ddef5
Fix JSON serialization of ConstraintSolver statistics
slavapestov Jan 9, 2017
8d46ec4
Actually enable scale-tests
slavapestov Jan 9, 2017
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
5 changes: 2 additions & 3 deletions lib/Sema/CSSolver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,19 +28,18 @@ using namespace constraints;
// Constraint solver statistics
//===----------------------------------------------------------------------===//
#define DEBUG_TYPE "Constraint solver overall"
#define JOIN(X,Y) JOIN2(X,Y)
#define JOIN2(X,Y) X##Y
STATISTIC(NumSolutionAttempts, "# of solution attempts");
STATISTIC(TotalNumTypeVariables, "# of type variables created");

#define CS_STATISTIC(Name, Description) \
STATISTIC(JOIN2(Overall,Name), Description);
STATISTIC(Overall##Name, Description);
#include "ConstraintSolverStats.def"

#undef DEBUG_TYPE
#define DEBUG_TYPE "Constraint solver largest system"
#define CS_STATISTIC(Name, Description) \
STATISTIC(JOIN2(Largest,Name), Description);
STATISTIC(Largest##Name, Description);
#include "ConstraintSolverStats.def"
STATISTIC(LargestSolutionAttemptNumber, "# of the largest solution attempt");

Expand Down
2 changes: 1 addition & 1 deletion utils/scale-test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ def run_once_with_primary(args, ast, rng, primary_idx):

mode = "-c"
if args.typecheck:
mode = "-typechec"
mode = "-typecheck"

focus = ["-primary-file", primary]
if args.whole_module_optimization:
Expand Down
2 changes: 1 addition & 1 deletion validation-test/compiler_scale/callee_analysis_invalidation.gyb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// RUN: %scale-test -O --threshold 0.2 --begin 20 --end 25 --step 1 --select computeMethodCallees %s
// REQUIRES: OS=macosx, tools-release, assertions
// REQUIRES: OS=macosx

class C0<T:Integer> {
func foo() {
Expand Down
2 changes: 1 addition & 1 deletion validation-test/compiler_scale/scale_neighbouring_getset.gyb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// RUN: %scale-test --sum-multi --typecheck --begin 5 --end 16 --step 5 --select typeCheckAbstractFunctionBody %s
// REQUIRES: OS=macosx, tools-release, assertions
// REQUIRES: OS=macosx
Copy link
Contributor

@graydon graydon Jan 9, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm pretty sure you need assertions on in order to get the statistics to be compiled-in. This will probably fail testing.


struct Struct${N} {
% if int(N) > 1:
Expand Down