martong created this revision.
martong added reviewers: NoQ, steakhal.
Herald added subscribers: manas, ASDenysPetrov, gamesh411, dkrupp, donat.nagy,
Szelethus, mikhail.ramalho, a.sidorin, rnkovacs, szepet, baloghadamsoftware,
xazax.hun.
Herald added a reviewer: Szelethus.
Herald added a project: All.
martong requested review of this revision.
Herald added a project: clang.
Herald added a subscriber: cfe-commits.
Depends on D124758 <https://reviews.llvm.org/D124758>. That patch introduced
serious regression in the run-time in
some special cases. This fixes that.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D126406
Files:
clang/include/clang/StaticAnalyzer/Core/PathSensitive/ProgramState.h
clang/lib/StaticAnalyzer/Core/RangeConstraintManager.cpp
clang/test/Analysis/runtime-regression.c
Index: clang/test/Analysis/runtime-regression.c
===================================================================
--- /dev/null
+++ clang/test/Analysis/runtime-regression.c
@@ -0,0 +1,54 @@
+// RUN: %clang_analyze_cc1 %s \
+// RUN: -analyzer-checker=core,alpha.security.ArrayBoundV2 \
+// RUN: -analyzer-checker=debug.ExprInspection \
+// RUN: -verify
+
+// This test is here to check if there is no significant run-time regression
+// related to the assume machinery. This is an automatically reduced code. The
+// analysis should finish in less than 10 seconds.
+
+// expected-no-diagnostics
+
+typedef unsigned char uint8_t;
+typedef unsigned short uint16_t;
+typedef unsigned long uint64_t;
+
+int filter_slice_word(int sat_linesize, int sigma, int radius, uint64_t *sat,
+ uint64_t *square_sat, int width, int height,
+ int src_linesize, int dst_linesize, const uint16_t *src,
+ uint16_t *dst, int jobnr, int nb_jobs) {
+ const int starty = height * jobnr / nb_jobs;
+ const int endy = height * (jobnr + 1) / nb_jobs;
+
+ for (int y = starty; y < endy; y++) {
+
+ int lower_y = y - radius < 0 ? 0 : y - radius;
+ int higher_y = y + radius + 1 > height ? height : y + radius + 1;
+ int dist_y = higher_y - lower_y;
+
+ for (int x = 0; x < width; x++) {
+
+ int lower_x = x - radius < 0 ? 0 : x - radius;
+ int higher_x = x + radius + 1 > width ? width : x + radius + 1;
+ int count = dist_y * (higher_x - lower_x);
+
+ // The below hunk caused significant regression in run-time.
+#if 1
+ uint64_t sum = sat[higher_y * sat_linesize + higher_x] -
+ sat[higher_y * sat_linesize + lower_x] -
+ sat[lower_y * sat_linesize + higher_x] +
+ sat[lower_y * sat_linesize + lower_x];
+ uint64_t square_sum = square_sat[higher_y * sat_linesize + higher_x] -
+ square_sat[higher_y * sat_linesize + lower_x] -
+ square_sat[lower_y * sat_linesize + higher_x] +
+ square_sat[lower_y * sat_linesize + lower_x];
+ uint64_t mean = sum / count;
+ uint64_t var = (square_sum - sum * sum / count) / count;
+ dst[y * dst_linesize + x] =
+ (sigma * mean + var * src[y * src_linesize + x]) / (sigma + var);
+#endif
+
+ }
+ }
+ return 0;
+}
Index: clang/lib/StaticAnalyzer/Core/RangeConstraintManager.cpp
===================================================================
--- clang/lib/StaticAnalyzer/Core/RangeConstraintManager.cpp
+++ clang/lib/StaticAnalyzer/Core/RangeConstraintManager.cpp
@@ -2534,6 +2534,9 @@
LLVM_NODISCARD ProgramStateRef reAssume(ProgramStateRef State,
const RangeSet *Constraint,
SVal TheValue) {
+ assert(State);
+ if (State->isPosteriorlyOverconstrained())
+ return nullptr;
if (!Constraint)
return State;
Index: clang/include/clang/StaticAnalyzer/Core/PathSensitive/ProgramState.h
===================================================================
--- clang/include/clang/StaticAnalyzer/Core/PathSensitive/ProgramState.h
+++ clang/include/clang/StaticAnalyzer/Core/PathSensitive/ProgramState.h
@@ -123,11 +123,12 @@
void setStore(const StoreRef &storeRef);
ProgramStateRef cloneAsPosteriorlyOverconstrained() const;
+
+public:
bool isPosteriorlyOverconstrained() const {
return PosteriorlyOverconstrained;
}
-public:
/// This ctor is used when creating the first ProgramState object.
ProgramState(ProgramStateManager *mgr, const Environment& env,
StoreRef st, GenericDataMap gdm);
Index: clang/test/Analysis/runtime-regression.c
===================================================================
--- /dev/null
+++ clang/test/Analysis/runtime-regression.c
@@ -0,0 +1,54 @@
+// RUN: %clang_analyze_cc1 %s \
+// RUN: -analyzer-checker=core,alpha.security.ArrayBoundV2 \
+// RUN: -analyzer-checker=debug.ExprInspection \
+// RUN: -verify
+
+// This test is here to check if there is no significant run-time regression
+// related to the assume machinery. This is an automatically reduced code. The
+// analysis should finish in less than 10 seconds.
+
+// expected-no-diagnostics
+
+typedef unsigned char uint8_t;
+typedef unsigned short uint16_t;
+typedef unsigned long uint64_t;
+
+int filter_slice_word(int sat_linesize, int sigma, int radius, uint64_t *sat,
+ uint64_t *square_sat, int width, int height,
+ int src_linesize, int dst_linesize, const uint16_t *src,
+ uint16_t *dst, int jobnr, int nb_jobs) {
+ const int starty = height * jobnr / nb_jobs;
+ const int endy = height * (jobnr + 1) / nb_jobs;
+
+ for (int y = starty; y < endy; y++) {
+
+ int lower_y = y - radius < 0 ? 0 : y - radius;
+ int higher_y = y + radius + 1 > height ? height : y + radius + 1;
+ int dist_y = higher_y - lower_y;
+
+ for (int x = 0; x < width; x++) {
+
+ int lower_x = x - radius < 0 ? 0 : x - radius;
+ int higher_x = x + radius + 1 > width ? width : x + radius + 1;
+ int count = dist_y * (higher_x - lower_x);
+
+ // The below hunk caused significant regression in run-time.
+#if 1
+ uint64_t sum = sat[higher_y * sat_linesize + higher_x] -
+ sat[higher_y * sat_linesize + lower_x] -
+ sat[lower_y * sat_linesize + higher_x] +
+ sat[lower_y * sat_linesize + lower_x];
+ uint64_t square_sum = square_sat[higher_y * sat_linesize + higher_x] -
+ square_sat[higher_y * sat_linesize + lower_x] -
+ square_sat[lower_y * sat_linesize + higher_x] +
+ square_sat[lower_y * sat_linesize + lower_x];
+ uint64_t mean = sum / count;
+ uint64_t var = (square_sum - sum * sum / count) / count;
+ dst[y * dst_linesize + x] =
+ (sigma * mean + var * src[y * src_linesize + x]) / (sigma + var);
+#endif
+
+ }
+ }
+ return 0;
+}
Index: clang/lib/StaticAnalyzer/Core/RangeConstraintManager.cpp
===================================================================
--- clang/lib/StaticAnalyzer/Core/RangeConstraintManager.cpp
+++ clang/lib/StaticAnalyzer/Core/RangeConstraintManager.cpp
@@ -2534,6 +2534,9 @@
LLVM_NODISCARD ProgramStateRef reAssume(ProgramStateRef State,
const RangeSet *Constraint,
SVal TheValue) {
+ assert(State);
+ if (State->isPosteriorlyOverconstrained())
+ return nullptr;
if (!Constraint)
return State;
Index: clang/include/clang/StaticAnalyzer/Core/PathSensitive/ProgramState.h
===================================================================
--- clang/include/clang/StaticAnalyzer/Core/PathSensitive/ProgramState.h
+++ clang/include/clang/StaticAnalyzer/Core/PathSensitive/ProgramState.h
@@ -123,11 +123,12 @@
void setStore(const StoreRef &storeRef);
ProgramStateRef cloneAsPosteriorlyOverconstrained() const;
+
+public:
bool isPosteriorlyOverconstrained() const {
return PosteriorlyOverconstrained;
}
-public:
/// This ctor is used when creating the first ProgramState object.
ProgramState(ProgramStateManager *mgr, const Environment& env,
StoreRef st, GenericDataMap gdm);
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
