Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Add support for deviations on next line and multiple lines#807

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.

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

Already on GitHub?Sign in to your account

Merged
MichaelRFairhurst merged 23 commits intomainfromlcartey/extend-deviations
Mar 12, 2025

Conversation

@lcartey
Copy link
Contributor

@lcarteylcartey commentedDec 3, 2024
edited by MichaelRFairhurst
Loading

Description

This PR proposes an extension of our deviations mechanism to support easier suppression of results at scale - including applying deviations to a block of code, to code on the next line and to code in macros.

We introduce a C/C++ attribute format -[[codeql::<standard>_deviation(<code-identifier>)]] - which applies the deviation distinguished by the<code-identifier> to the program element, and those nested within it. This attribute can be applied to:

  • Statements
  • Variables
  • Functions

For example,[[codeql::autosar_deviation("a0-4-2")]] would apply the deviation specified using the code identifiera0-4-2, related to theautosar Coding Standard.

Custom attributes are not universally supported - for example, they were only introduced in C23 - so we also provide an attribute-like syntax to be used in comment markers:

  • codeql::<standard>_deviation(<code-identifier>) - the deviation applies to results on the current line (duplication of existing non-annotated support, included for consistency).
  • codeql::<standard>_deviation_next_line(<code-identifier>) - this deviation applies to results on the next line.
  • codeql::<standard>_deviation_begin(<code-identifier>) - marks the beginning of a range of lines where the deviation applies.
  • codeql::<standard>_deviation_end(<code-identifier>) - marks the end of a range of lines where the deviation applies.

This would address#326.

Change request type

  • Release or process automation (GitHub workflows, internal scripts)
  • Internal documentation
  • External documentation
  • Query files (.ql,.qll,.qls or unit tests)
  • External scripts (analysis report or other code shipped as part of a release)

Rules with added or modified queries

  • No rules added
  • Queries have been added for the following rules:
    • rule number here
  • Queries have been modified for the following rules:
    • rule number here

Release change checklist

A change note (development_handbook.md#change-notes) is required for any pull request which modifies:

  • The structure or layout of the release artifacts.
  • The evaluation performance (memory, execution time) of an existing query.
  • The results of an existing query in any circumstance.

If you are only adding new rule queries, a change note is not required.

Author: Is a change note required?

  • Yes
  • No

🚨🚨🚨
Reviewer: Confirm that format ofshared queries (not the .qll file, the
.ql file that imports it) is valid by running them within VS Code.

  • Confirmed

Reviewer: Confirm that either a change note is not required or the change note is required and has been added.

  • Confirmed

Query development review checklist

For PRs that add new queries or modify existing queries, the following checklist should be completed by both the author and reviewer:

Author

  • Have all the relevant rule package description files been checked in?
  • Have you verified that the metadata properties of each new query is set appropriately?
  • Do all the unit tests contain both "COMPLIANT" and "NON_COMPLIANT" cases?
  • Are the alert messages properly formatted and consistent with thestyle guide?
  • Have you run the queries on OpenPilot and verified that the performance and results are acceptable?
    As a rule of thumb, predicates specific to the query should take no more than 1 minute, and for simple queries be under 10 seconds. If this is not the case, this should be highlighted and agreed in the code review process.
  • Does the query have an appropriate level of in-query comments/documentation?
  • Have you considered/identified possible edge cases?
  • Does the query not reinvent features in the standard library?
  • Can the query be simplified further (not golfed!)

Reviewer

  • Have all the relevant rule package description files been checked in?
  • Have you verified that the metadata properties of each new query is set appropriately?
  • Do all the unit tests contain both "COMPLIANT" and "NON_COMPLIANT" cases?
  • Are the alert messages properly formatted and consistent with thestyle guide?
  • Have you run the queries on OpenPilot and verified that the performance and results are acceptable?
    As a rule of thumb, predicates specific to the query should take no more than 1 minute, and for simple queries be under 10 seconds. If this is not the case, this should be highlighted and agreed in the code review process.
  • Does the query have an appropriate level of in-query comments/documentation?
  • Have you considered/identified possible edge cases?
  • Does the query not reinvent features in the standard library?
  • Can the query be simplified further (not golfed!)

lgtm-style suppressions are no longer supported by CodeQL andCode Scanning.
This new library supports deviating on the next line, or on ranges,in addition to deviating on the current line.
This ties in the code-identifier deviation support to the deviationsand exclusions libraries.
This commit adds support for C/C++ attributes to specify deviationswith code identifiers in the code.Attributes are inherited from parents, and support multiple codeidentifiers in a single definition.
Attributes are inherited from their parent.Includes support for features which are not currently enabled,due to lack of support in CodeQL itself.
Copy link
Collaborator

@MichaelRFairhurstMichaelRFairhurst left a comment

Choose a reason for hiding this comment

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

Fun PR to read through, very cool to see the stack as a solution for implementing pairings in an immutable context like CodeQL! Some thoughts on it since its a cool weedy coding task!

Copy link
Collaborator

@MichaelRFairhurstMichaelRFairhurst left a comment

Choose a reason for hiding this comment

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

Thanks, LGTM! Just one question left.

Deviation code identifier markers can have multiple records.
@lcartey
Copy link
ContributorAuthor

/test-performance

@github-actions
Copy link

🏁 Beep Boop! Performance testing for this PR has been initiated. Please check back later for results. Note that the query package generation step must complete before testing will start so it might be a minute.

💡 If you do not hear back from me please check my status!I will report even if I fail!

@codeql-coding-standards-automation

🏁 Beep Boop! Performance testing complete! See below for performance of the last 3 runs vs your PR. Times are based on predicate performance. You canfind full graphs and stats in the PR that was created for this test in the release engineering repo.

Release                            : v2.40.0Platform                           : x86-linuxLanguage                           : cTotal_Serialized_Execution_Time_Ms : 2324585Mean_Predicate_Execution_Time_Ms   : 49.33329796264856Median_Predicate_Execution_Time_Ms : 0.0Standard_Deviation_Ms              : 609.8238396111128Total_Serialized_Execution_Time_s  : 2324.585Mean_Query_Execution_Time_s        : 0.0493332979626485Median_Predicate_Execution_Time_s  : 0.0Percentile95_Ms                    : 130.0Number_of_Predicates               : 47120Release                            : v2.40.0Platform                           : x86-linuxLanguage                           : cppTotal_Serialized_Execution_Time_Ms : 3401112Mean_Predicate_Execution_Time_Ms   : 71.22300169622851Median_Predicate_Execution_Time_Ms : 0.0Standard_Deviation_Ms              : 833.5216392962146Total_Serialized_Execution_Time_s  : 3401.112Mean_Query_Execution_Time_s        : 0.0712230016962285Median_Predicate_Execution_Time_s  : 0.0Percentile95_Ms                    : 164.0Number_of_Predicates               : 47753Release                            : v2.40.0Platform                           : x86-windowsLanguage                           : cTotal_Serialized_Execution_Time_Ms : 2750095Mean_Predicate_Execution_Time_Ms   : 58.13416902718471Median_Predicate_Execution_Time_Ms : 0.0Standard_Deviation_Ms              : 625.59540936855Total_Serialized_Execution_Time_s  : 2750.095Mean_Query_Execution_Time_s        : 0.0581341690271847Median_Predicate_Execution_Time_s  : 0.0Percentile95_Ms                    : 157.0Number_of_Predicates               : 47306Release                            : v2.40.0Platform                           : x86-windowsLanguage                           : cppTotal_Serialized_Execution_Time_Ms : 3458422Mean_Predicate_Execution_Time_Ms   : 71.6088702998178Median_Predicate_Execution_Time_Ms : 1.0Standard_Deviation_Ms              : 715.7345866890012Total_Serialized_Execution_Time_s  : 3458.422Mean_Query_Execution_Time_s        : 0.0716088702998178Median_Predicate_Execution_Time_s  : 0.001Percentile95_Ms                    : 185.0Number_of_Predicates               : 48296Release                            : v2.41.0Platform                           : x86-linuxLanguage                           : cTotal_Serialized_Execution_Time_Ms : 2294636Mean_Predicate_Execution_Time_Ms   : 48.58120381936358Median_Predicate_Execution_Time_Ms : 0.0Standard_Deviation_Ms              : 604.830695062583Total_Serialized_Execution_Time_s  : 2294.636Mean_Query_Execution_Time_s        : 0.0485812038193635Median_Predicate_Execution_Time_s  : 0.0Percentile95_Ms                    : 125.0Number_of_Predicates               : 47233Release                            : v2.41.0Platform                           : x86-linuxLanguage                           : cppTotal_Serialized_Execution_Time_Ms : 3386576Mean_Predicate_Execution_Time_Ms   : 71.21537620389452Median_Predicate_Execution_Time_Ms : 0.0Standard_Deviation_Ms              : 819.0328105072083Total_Serialized_Execution_Time_s  : 3386.576Mean_Query_Execution_Time_s        : 0.0712153762038945Median_Predicate_Execution_Time_s  : 0.0Percentile95_Ms                    : 158.0Number_of_Predicates               : 47554Release                            : v2.41.0Platform                           : x86-windowsLanguage                           : cTotal_Serialized_Execution_Time_Ms : 2793839Mean_Predicate_Execution_Time_Ms   : 59.077604618214885Median_Predicate_Execution_Time_Ms : 0.0Standard_Deviation_Ms              : 617.7343684735914Total_Serialized_Execution_Time_s  : 2793.839Mean_Query_Execution_Time_s        : 0.0590776046182148Median_Predicate_Execution_Time_s  : 0.0Percentile95_Ms                    : 156.0Number_of_Predicates               : 47291Release                            : v2.41.0Platform                           : x86-windowsLanguage                           : cppTotal_Serialized_Execution_Time_Ms : 3242287Mean_Predicate_Execution_Time_Ms   : 67.19905075752865Median_Predicate_Execution_Time_Ms : 1.0Standard_Deviation_Ms              : 670.443137227368Total_Serialized_Execution_Time_s  : 3242.287Mean_Query_Execution_Time_s        : 0.0671990507575286Median_Predicate_Execution_Time_s  : 0.001Percentile95_Ms                    : 184.0Number_of_Predicates               : 48249Release                            : 807Platform                           : x86-linuxLanguage                           : cppTotal_Serialized_Execution_Time_Ms : 3080795Mean_Predicate_Execution_Time_Ms   : 63.72520426104044Median_Predicate_Execution_Time_Ms : 0.0Standard_Deviation_Ms              : 838.3441207331775Total_Serialized_Execution_Time_s  : 3080.795Mean_Query_Execution_Time_s        : 0.0637252042610404Median_Predicate_Execution_Time_s  : 0.0Percentile95_Ms                    : 160.0Number_of_Predicates               : 48345Release                            : 807Platform                           : x86-linuxLanguage                           : cTotal_Serialized_Execution_Time_Ms : 2592925Mean_Predicate_Execution_Time_Ms   : 51.10118050491713Median_Predicate_Execution_Time_Ms : 0.0Standard_Deviation_Ms              : 781.4418270988062Total_Serialized_Execution_Time_s  : 2592.925Mean_Query_Execution_Time_s        : 0.0511011805049171Median_Predicate_Execution_Time_s  : 0.0Percentile95_Ms                    : 122.0Number_of_Predicates               : 50741

🏁 Below are the slowest predicates for the last 2 releases vs this PR.

Release           : v2.41.0Run               : 2025-01-27_15-31-47Platform          : x86-windowsLanguage          : cSuite             : misra-defaultPredicate         : _ExternalFlow::elementSpecMatchesSignature/6#c67d3446_Function::Function.getClassAndName/1#27b7404e___#sharedExecution_Time_Ms : 44405Release           : v2.41.0Run               : 2025-01-27_15-31-47Platform          : x86-windowsLanguage          : cSuite             : misra-defaultPredicate         : QualifiedName::getUserTypeNameWithoutArgs/1#8cfc98e9Execution_Time_Ms : 29847Release           : v2.41.0Run               : 2025-01-27_15-31-47Platform          : x86-linuxLanguage          : cSuite             : misra-defaultPredicate         : OutOfBounds::OOB::libraryFunctionNameParamTable/5#79217c12Execution_Time_Ms : 33073Release           : v2.41.0Run               : 2025-01-27_15-31-47Platform          : x86-windowsLanguage          : cSuite             : misra-defaultPredicate         : _Macro::Macro.getName/0#dispred#e28b3699_Preprocessor::PreprocessorBranchDirective#bcd2bde4_Preproce__#antijoin_rhsExecution_Time_Ms : 63221Release           : v2.41.0Run               : 2025-01-27_15-31-47Platform          : x86-linuxLanguage          : cSuite             : misra-defaultPredicate         : OutOfBounds::OOB::libraryFunctionNameParamTableSimpleString/5#6de8614f#cpe#1236Execution_Time_Ms : 39638Release           : v2.41.0Run               : 2025-01-27_15-31-47Platform          : x86-windowsLanguage          : cppSuite             : autosar-defaultPredicate         : _comments#sharedExecution_Time_Ms : 26504Release           : v2.41.0Run               : 2025-01-27_15-31-47Platform          : x86-windowsLanguage          : cppSuite             : autosar-defaultPredicate         : __Class::Class.accessOfBaseMemberMulti/2#6d0f61c0#ffbf_specifiers#max_range__Class::Class.accessOfBa__#join_rhsExecution_Time_Ms : 33628Release           : v2.41.0Run               : 2025-01-27_15-31-47Platform          : x86-windowsLanguage          : cppSuite             : autosar-defaultPredicate         : HardwareOrProtocolInterface::HardwareOrProtocolInterfaceClass#class#7f026171Execution_Time_Ms : 32209Release           : v2.41.0Run               : 2025-01-27_15-31-47Platform          : x86-windowsLanguage          : cppSuite             : autosar-defaultPredicate         : _ExternalFlow::elementSpecMatchesSignature/6#c67d3446_Function::Function.getClassAndName/1#27b7404e___#sharedExecution_Time_Ms : 67471Release           : v2.41.0Run               : 2025-01-27_15-31-47Platform          : x86-windowsLanguage          : cSuite             : misra-defaultPredicate         : OutOfBounds::OOB::libraryFunctionNameParamTableSimpleString/5#6de8614f#cpe#1236Execution_Time_Ms : 39301Release           : v2.41.0Run               : 2025-01-27_15-31-47Platform          : x86-windowsLanguage          : cSuite             : misra-defaultPredicate         : OutOfBounds::OOB::libraryFunctionNameParamTable/5#79217c12Execution_Time_Ms : 30349Release           : v2.41.0Run               : 2025-01-27_15-31-47Platform          : x86-linuxLanguage          : cSuite             : misra-defaultPredicate         : _Macro::Macro.getName/0#dispred#e28b3699_Preprocessor::PreprocessorBranchDirective#bcd2bde4_Preproce__#antijoin_rhsExecution_Time_Ms : 66713Release           : v2.41.0Run               : 2025-01-27_15-31-47Platform          : x86-linuxLanguage          : cppSuite             : autosar-defaultPredicate         : @element#bExecution_Time_Ms : 37358Release           : v2.41.0Run               : 2025-01-27_15-31-47Platform          : x86-linuxLanguage          : cSuite             : misra-defaultPredicate         : _ExternalFlow::elementSpecMatchesSignature/6#c67d3446_Function::Function.getClassAndName/1#27b7404e___#sharedExecution_Time_Ms : 47157Release           : v2.41.0Run               : 2025-01-27_15-31-47Platform          : x86-linuxLanguage          : cSuite             : misra-defaultPredicate         : _Call::FunctionCall#2b14a517_Call::FunctionCall.getTarget/0#dispred#935da4c5_Function::Function.getP__#antijoin_rhsExecution_Time_Ms : 27555Release           : v2.41.0Run               : 2025-01-27_15-31-47Platform          : x86-linuxLanguage          : cppSuite             : autosar-defaultPredicate         : FunctionEquivalence::typeSig/1#194ac728Execution_Time_Ms : 48401Release           : v2.41.0Run               : 2025-01-27_15-31-47Platform          : x86-linuxLanguage          : cppSuite             : autosar-defaultPredicate         : _comments#sharedExecution_Time_Ms : 38869Release           : v2.41.0Run               : 2025-01-27_15-31-47Platform          : x86-linuxLanguage          : cppSuite             : autosar-defaultPredicate         : OrderingPredicateMustBeStrictlyWeak::UserDefinedStrictlyWeakOrderingComparator#6c60f803Execution_Time_Ms : 37907Release           : v2.41.0Run               : 2025-01-27_15-31-47Platform          : x86-linuxLanguage          : cppSuite             : autosar-defaultPredicate         : _Call::Call.getAnArgument/0#dispred#0c956949_10#join_rhs_Call::FunctionCall#2b14a517_Element::Elemen__#sharedExecution_Time_Ms : 34634Release           : v2.41.0Run               : 2025-01-27_15-31-47Platform          : x86-windowsLanguage          : cppSuite             : autosar-defaultPredicate         : FunctionEquivalence::typeSig/1#194ac728Execution_Time_Ms : 53166Release           : 807Run               : 2025-02-18_23-18-05Platform          : x86-linuxLanguage          : cppSuite             : autosar-defaultPredicate         : _comments#sharedExecution_Time_Ms : 45242Release           : 807Run               : 2025-02-18_23-18-05Platform          : x86-linuxLanguage          : cppSuite             : autosar-defaultPredicate         : UnusedVariables::maybeACompileTimeTemplateArgument/1#9ea118f0Execution_Time_Ms : 69124Release           : 807Run               : 2025-02-18_23-18-05Platform          : x86-linuxLanguage          : cppSuite             : autosar-defaultPredicate         : Function::Function.getParameter/1#dispred#200dcf26#fbfExecution_Time_Ms : 76438Release           : 807Run               : 2025-02-18_23-18-05Platform          : x86-linuxLanguage          : cSuite             : misra-defaultPredicate         : _Macro::Macro.getName/0#dispred#e28b3699_Preprocessor::PreprocessorBranchDirective#bcd2bde4_Preproce__#antijoin_rhsExecution_Time_Ms : 59978Release           : 807Run               : 2025-02-18_23-18-05Platform          : x86-linuxLanguage          : cSuite             : misra-defaultPredicate         : ResourceLeakAnalysis::ResourceLeakConfigSig[MutexObjectsNotAlwaysUnlocked::MutexLeakConfig]::getAnAlias/1#e76446beExecution_Time_Ms : 104697Release           : 807Run               : 2025-02-18_23-18-05Platform          : x86-linuxLanguage          : cSuite             : misra-defaultPredicate         : OutOfBounds::OOB::libraryFunctionNameParamTableSimpleString/5#6de8614f#cpe#1236Execution_Time_Ms : 39521Release           : 807Run               : 2025-02-18_23-18-05Platform          : x86-linuxLanguage          : cppSuite             : autosar-defaultPredicate         : _ExternalFlow::elementSpecMatchesSignature/6#c67d3446_Function::Function.getClassAndName/1#27b7404e___#sharedExecution_Time_Ms : 39656Release           : 807Run               : 2025-02-18_23-18-05Platform          : x86-linuxLanguage          : cppSuite             : autosar-defaultPredicate         : _Declaration::Declaration.getADeclarationEntry/0#dispred#c5d61b67_Declaration::DeclarationEntry.isDe__#antijoin_rhsExecution_Time_Ms : 48111Release           : 807Run               : 2025-02-18_23-18-05Platform          : x86-linuxLanguage          : cSuite             : misra-defaultPredicate         : OutOfBounds::OOB::libraryFunctionNameParamTable/5#79217c12Execution_Time_Ms : 43210Release           : 807Run               : 2025-02-18_23-18-05Platform          : x86-linuxLanguage          : cSuite             : misra-defaultPredicate         : _ExternalFlow::elementSpecMatchesSignature/6#c67d3446_Function::Function.getClassAndName/1#27b7404e___#sharedExecution_Time_Ms : 59198

@fjatWbyT
Copy link
Contributor

Release                            : v2.40.0Platform                           : x86-linuxLanguage                           : c[ snip ]Mean_Predicate_Execution_Time_Ms   : 49.33329796264856[ snip ]Mean_Query_Execution_Time_s        : 0.0493332979626485[ snip ]

While going through the first table, I think thatMean_Query_Execution_Time_s isMean_Predicate_Execution_Time_s.

The salient result I noticed in 807 is in the second table:

Release           : 807Run               : 2025-02-18_23-18-05Platform          : x86-linuxLanguage          : cSuite             : misra-defaultPredicate         : ResourceLeakAnalysis::ResourceLeakConfigSig[MutexObjectsNotAlwaysUnlocked::MutexLeakConfig]::getAnAlias/1#e76446beExecution_Time_Ms : 104697

Copy link
Collaborator

@MichaelRFairhurstMichaelRFairhurst left a comment

Choose a reason for hiding this comment

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

LGTM!

@MichaelRFairhurstMichaelRFairhurst added this pull request to themerge queueMar 12, 2025
@MichaelRFairhurst
Copy link
Collaborator

@fjatWbyT yes, good catch. That was introduced past the last release (by me!) and was fixed. Overall, esp. with that fixed, everything here looks great to me.

fjatWbyT reacted with rocket emoji

Merged via the queue intomain with commitafbfbecMar 12, 2025
25 checks passed
@MichaelRFairhurstMichaelRFairhurst deleted the lcartey/extend-deviations branchMarch 12, 2025 02:17
Sign up for freeto join this conversation on GitHub. Already have an account?Sign in to comment

Reviewers

@MichaelRFairhurstMichaelRFairhurstMichaelRFairhurst approved these changes

+1 more reviewer

@fjatWbyTfjatWbyTfjatWbyT left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@lcartey@fjatWbyT@MichaelRFairhurst

[8]ページ先頭

©2009-2025 Movatter.jp