C++: Make AST GVN a wrapper for IR-based GVN #2724

MathiasVP · 2020-01-30T10:25:06Z

This PR continues the work in #1542 by:

Implementing toString() as result = "GVN"
Adding a hasLocation() predicate
Implementing getKind()
Implementing getAnExpr()
Adding tests demonstrating the differences between AST-based GVN and IR-based GVN

cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/gvn/ValueNumbering.qll

cpp/ql/test/library-tests/valuenumbering/GlobalValueNumbering/ir_uniqueness.ql

csharp/ql/src/semmle/code/csharp/ir/implementation/raw/gvn/internal/ValueNumberingImports.qll

...rc/semmle/code/csharp/ir/implementation/unaliased_ssa/gvn/internal/ValueNumberingImports.qll

cpp/ql/test/library-tests/valuenumbering/GlobalValueNumbering/ir_uniqueness.expected

...ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/gvn/internal/ValueNumberingInternal.qll

…alueNumber

…ernal/ValueNumberingImports.qll Co-Authored-By: Robert Marsh <[email protected]>

…sa/gvn/internal/ValueNumberingImports.qll Co-Authored-By: Robert Marsh <[email protected]>

…nternal/ValueNumberingInternal.qll Co-Authored-By: Robert Marsh <[email protected]>

…ted output)

cpp/ql/test/library-tests/valuenumbering/GlobalValueNumbering/ir_gvn.expected

…vider

…n ValueNumber

…ue to the hasLocationInfo not picked the 'smallest' location (as Robert suggested we should do)

cpp/ql/src/semmle/code/cpp/ir/internal/ASTValueNumbering.qll

cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/gvn/ValueNumbering.qll

…tDebugString. Instead, call that one in the AST wrapper

…e which have AST representations are numbered

...rc/semmle/code/csharp/ir/implementation/unaliased_ssa/gvn/internal/ValueNumberingImports.qll

… to prevent the sync script from complaining

cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/gvn/ValueNumbering.qll

… with a given value number. Also added a getKind for the AST value numbering implementation with the same behavior as the IR value numbering

MathiasVP changed the title ~~Make AST GVN a wrapper for IR-based GVN~~ C++: Make AST GVN a wrapper for IR-based GVN Jan 30, 2020

MathiasVP added the C++ label Jan 30, 2020

MathiasVP force-pushed the rdmarsh2/rdmarsh/cpp/ir-gvn-ast-wrapper branch from d91dfb7 to dee1f24 Compare January 30, 2020 14:12

MathiasVP marked this pull request as ready for review January 30, 2020 15:46

MathiasVP requested review from a team as code owners January 30, 2020 15:46

rdmarsh2 suggested changes Jan 30, 2020

View reviewed changes

Robert Marsh and others added 18 commits January 31, 2020 12:15

C++: separate IR ValueNumber newtype and interface

d0026f9

C++: add IR-based wrapper for value numbering

da732d5

C++: Change toString predicate and add hasLocationInfo predicate on V…

48cff3b

…alueNumber

C++: Added getKind predicate

de0a6d6

C++: Added IR global value numbering uniqueness test

8fc9a71

C++: Sync'd unaliased_ssa and aliased_ssa files

f586719

C++: Added getAnExpr predicate to ValueNumber class

4b74d11

C++: Added getAnExpr test

c01a4b7

C++: Fix incorrect merge conflict resolution

6f0a521

C#: Sync files

26dbf05

C++: Fix new formatting (hopefully)

ea2f653

Update csharp/ql/src/semmle/code/csharp/ir/implementation/raw/gvn/int…

2a7fad7

…ernal/ValueNumberingImports.qll Co-Authored-By: Robert Marsh <[email protected]>

Update csharp/ql/src/semmle/code/csharp/ir/implementation/unaliased_s…

e2348e0

…sa/gvn/internal/ValueNumberingImports.qll Co-Authored-By: Robert Marsh <[email protected]>

Update cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/gvn/i…

c70deb1

…nternal/ValueNumberingInternal.qll Co-Authored-By: Robert Marsh <[email protected]>

Update cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/gvn/i…

61d5c2a

…nternal/ValueNumberingInternal.qll Co-Authored-By: Robert Marsh <[email protected]>

C++: Updated ir_uniqueness test based on Robert's comments (and accep…

9968d76

…ted output)

C++: Accepted ir_gvn output after changing toString implemenetation

2adc658

C++/C#: Sync identical files

8b91c2d

MathiasVP force-pushed the rdmarsh2/rdmarsh/cpp/ir-gvn-ast-wrapper branch from eefaf4c to 8b91c2d Compare January 31, 2020 11:17

jbj reviewed Jan 31, 2020

View reviewed changes

cpp/ql/test/library-tests/valuenumbering/GlobalValueNumbering/ir_gvn.expected Outdated Show resolved Hide resolved

MathiasVP added 3 commits January 31, 2020 13:36

C++: Fix bad merge

46e1fbc

C++: Use getDebugString instead of toString in ValueNumberPropertyPro…

a6dfe9d

…vider

C++: Accept output

50030bc

MathiasVP added 6 commits January 31, 2020 13:40

C++/C#: Sync identical files

02be5fc

C++: Fix new formatting

0f71d83

C++: Modify Bound.qll to use hasLocationInfo instead of getLocation o…

5243a6a

…n ValueNumber

C++: Sync identical files

fba14f8

C++: Accept output. Currently too many locations are being reported d…

a4977a9

…ue to the hasLocationInfo not picked the 'smallest' location (as Robert suggested we should do)

C++: Fix formatting

77b888f

jbj reviewed Feb 3, 2020

View reviewed changes

cpp/ql/src/semmle/code/cpp/ir/internal/ASTValueNumbering.qll Outdated Show resolved Hide resolved

cpp/ql/src/semmle/code/cpp/ir/internal/ASTValueNumbering.qll Show resolved Hide resolved

cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/gvn/ValueNumbering.qll Show resolved Hide resolved

MathiasVP added 13 commits February 3, 2020 10:10

C++: Replace rank[1] with min

a605fec

C++: Replace implementation of hasLocationInfo with getLocation

cb52388

C++: GVN should use getUnconverted[...] instead of getConverted[...]

c7617f5

C++: Fix spelling

b7eb23a

C++: Don't call getUnconvertedResultExpression in ValueNumbering's ge…

f0521dd

…tDebugString. Instead, call that one in the AST wrapper

C++: Accept test output

9cd2c23

C++: Add charpred to ASTValueNumbering class to ensure that only valu…

2ec0d72

…e which have AST representations are numbered

C++: Accepted test output for test_ir_expr

f5c95c8

C++: Formatting

ac1b19b

C++: Fix imports

d06f130

C++/C#: Sync identical files

2a21627

Accept test output

94a089c

C#: Sync identical files

cb9c0cf

rdmarsh2 reviewed Feb 3, 2020

View reviewed changes

...rc/semmle/code/csharp/ir/implementation/unaliased_ssa/gvn/internal/ValueNumberingImports.qll Outdated Show resolved Hide resolved

C#: Move imports from ValueNumberingImports to ValueNumberingInternal…

3c9c2b2

… to prevent the sync script from complaining

jbj reviewed Feb 4, 2020

View reviewed changes

cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/gvn/ValueNumbering.qll Outdated Show resolved Hide resolved

MathiasVP added 3 commits February 4, 2020 09:37

Add a getAConvertedExpr predicate for obtaining converted expressions…

0bb900c

… with a given value number. Also added a getKind for the AST value numbering implementation with the same behavior as the IR value numbering

C#: Fix import

b690e14

C++/C#: Sync identical files

19b68fe

MathiasVP requested a review from rdmarsh2 February 4, 2020 14:28

MathiasVP added the WIP This is a work-in-progress, do not merge yet! label Feb 5, 2020

MathiasVP mentioned this pull request Feb 5, 2020

C++: Make AST GVN a wrapper for IR-based GVN #2765

Merged

MathiasVP closed this Feb 5, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

C++: Make AST GVN a wrapper for IR-based GVN #2724

C++: Make AST GVN a wrapper for IR-based GVN #2724

Uh oh!

MathiasVP commented Jan 30, 2020

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

C++: Make AST GVN a wrapper for IR-based GVN #2724

C++: Make AST GVN a wrapper for IR-based GVN #2724

Uh oh!

Conversation

MathiasVP commented Jan 30, 2020

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants