valueflow-fast: Added a --check-level=fast option.

danmar · danmar · commit ee9defad65c6 · 2024-12-03T15:58:07.000+01:00
diff --git a/cli/cmdlineparser.cpp b/cli/cmdlineparser.cpp
@@ -471,7 +471,9 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
             else if (std::strncmp(argv[i], "--check-level=", 14) == 0) {
                 Settings::CheckLevel level = Settings::CheckLevel::normal;
                 const std::string level_s(argv[i] + 14);
-                if (level_s == "normal")
+                if (level_s == "reduced")
+                    level = Settings::CheckLevel::reduced;
+                else if (level_s == "normal")
                     level = Settings::CheckLevel::normal;
                 else if (level_s == "exhaustive")
                     level = Settings::CheckLevel::exhaustive;
@@ -947,6 +949,11 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
                     return Result::Fail;
             }
 
+            else if (std::strncmp(argv[i], "--performance-valueflow-max-iterations=", 39) == 0) {
+                if (!parseNumberArg(argv[i], 39, mSettings.vfOptions.maxIterations, true))
+                    return Result::Fail;
+            }
+
             // Specify platform
             else if (std::strncmp(argv[i], "--platform=", 11) == 0) {
                 const std::string platform(11+argv[i]);
@@ -1518,8 +1525,9 @@ void CmdLineParser::printHelp() const
         "    --check-config       Check cppcheck configuration. The normal code\n"
         "                         analysis is disabled by this flag.\n"
         "    --check-level=<level>\n"
-        "                         Configure how much checking you want:\n"
-        "                          * normal: Cppcheck uses some compromises in the checking so\n"
+        "                         Configure how much valueflow analysis you want:\n"
+        "                          * reduced: Reduce valueflow to finish checking quickly.\n"
+        "                          * normal: Cppcheck uses some compromises in the analysis so\n"
         "                            the checking will finish in reasonable time.\n"
         "                          * exhaustive: deeper analysis that you choose when you can\n"
         "                            wait.\n"
diff --git a/lib/settings.cpp b/lib/settings.cpp
@@ -299,7 +299,16 @@ void Settings::loadSummaries()
 
 void Settings::setCheckLevel(CheckLevel level)
 {
-    if (level == CheckLevel::normal) {
+    if (level == CheckLevel::reduced) {
+        // Checking should finish quickly.
+        checkLevel = level;
+        vfOptions.maxSubFunctionArgs = 8;
+        vfOptions.maxIfCount = 100;
+        vfOptions.doConditionExpressionAnalysis = false;
+        vfOptions.maxForwardBranches = 4;
+        vfOptions.maxIterations = 1;
+    }
+    else if (level == CheckLevel::normal) {
         // Checking should finish in reasonable time.
         checkLevel = level;
         vfOptions.maxSubFunctionArgs = 8;
diff --git a/lib/settings.h b/lib/settings.h
@@ -511,7 +511,8 @@ class CPPCHECKLIB WARN_UNUSED Settings {
         return jobs == 1;
     }
 
-    enum class CheckLevel : std::uint8_t {
+    enum class CheckLevel: std::uint8_t {
+        reduced,
         normal,
         exhaustive
     };
diff --git a/tools/compare-valueflow-options.py b/tools/compare-valueflow-options.py
@@ -46,20 +46,20 @@ def format_float(a, b=1):
         os.makedirs(work_path)
 
     lib.set_jobs('-j' + str(args.j))
-    result_file = os.path.join(work_path, args.o)
-    (f, ext) = os.path.splitext(result_file)
-    timing_file = f + '_timing' + ext
-    normal_results = f + '_normal' + ext
-    exhaustive_results = f + '_exhaustive' + ext
-
-    if os.path.exists(result_file):
-        os.remove(result_file)
-    if os.path.exists(timing_file):
-        os.remove(timing_file)
-    if os.path.exists(normal_results):
-        os.remove(normal_results)
-    if os.path.exists(exhaustive_results):
-        os.remove(exhaustive_results)
+
+    def results_file(name):
+        f, ext = os.path.splitext(args.o)
+        return os.path.join(work_path, f + '_' + name + ext)
+
+    opts = {'0': '--check-level=exhaustive --suppress=valueFlow*',
+            'it2': '--check-level=exhaustive --performance-valueflow-max-iterations=2 --suppress=valueFlow*',
+            'it1': '--check-level=exhaustive --performance-valueflow-max-iterations=1 --suppress=valueFlow*',
+            'if8': '--check-level=exhaustive --performance-valueflow-max-if-count=8 --suppress=valueFlow*'}
+
+    for o in opts.keys():
+        f = results_file(o)
+        if os.path.exists(f):
+            os.remove(f)
 
     cppcheck_path = args.cppcheck_path
 
@@ -117,95 +117,52 @@ def format_float(a, b=1):
             print("No files to process")
             continue
 
-        results_to_diff = []
+        results_to_diff = list()
+        timings = list()
 
-        normal_crashed = False
-        exhaustive_crashed = False
-
-        normal_timeout = False
-        exhaustive_timeout = False
+        crashed = []
+        timeout = []
 
         enable = 'style'
         debug_warnings = False
 
         libraries = lib.library_includes.get_libraries(source_path)
-        c, errout, info, time_normal, cppcheck_options, timing_info = lib.scan_package(cppcheck_path, source_path, libraries, enable=enable, debug_warnings=debug_warnings, check_level='normal')
-        if c < 0:
-            if c == -101 and 'error: could not find or open any of the paths given.' in errout:
-                # No sourcefile found (for example only headers present)
-                print('Error: 101')
-            elif c == lib.RETURN_CODE_TIMEOUT:
-                print('Normal check level timed out!')
-                normal_timeout = True
-                continue # we don't want to compare timeouts
-            else:
-                print('Normal check level crashed!')
-                normal_crashed = True
-        results_to_diff.append(errout)
-
-        c, errout, info, time_exhaustive, cppcheck_options, timing_info = lib.scan_package(cppcheck_path, source_path, libraries, enable=enable, debug_warnings=debug_warnings, check_level='exhaustive')
-        if c < 0:
-            if c == -101 and 'error: could not find or open any of the paths given.' in errout:
-                # No sourcefile found (for example only headers present)
-                print('Error: 101')
-            elif c == lib.RETURN_CODE_TIMEOUT:
-                print('Exhaustive check level timed out!')
-                exhaustive_timeout = True
-                continue # we don't want to compare timeouts
-            else:
-                print('Exhaustive check level crashed!')
-                exhaustive_crashed = True
-        results_to_diff.append(errout)
-
-        if normal_crashed or exhaustive_crashed:
-            who = None
-            if normal_crashed and exhaustive_crashed:
-                who = 'Both'
-            elif normal_crashed:
-                who = 'Normal'
-            else:
-                who = 'Exhaustive'
-            crashes.append(package + ' ' + who)
-
-        if normal_timeout or exhaustive_timeout:
-            who = None
-            if normal_timeout and exhaustive_timeout:
-                who = 'Both'
-            elif normal_timeout:
-                who = 'Normal'
-            else:
-                who = 'Exhaustive'
-            timeouts.append(package + ' ' + who)
-
-        with open(result_file, 'a') as myfile:
-            myfile.write(package + '\n')
-            diff = lib.diff_results('normal', results_to_diff[0], 'exhaustive', results_to_diff[1])
-            if not normal_crashed and not exhaustive_crashed and diff != '':
+
+        for id, extra_args in opts.items():
+            print('scan:'+id)
+            c, errout, info, time, cppcheck_options, timing_info = lib.scan_package(cppcheck_path, source_path, libraries, enable=enable, extra_args=extra_args)
+            if c < 0:
+                if c == -101 and 'error: could not find or open any of the paths given.' in errout:
+                    # No sourcefile found (for example only headers present)
+                    print('Error: 101')
+                elif c == lib.RETURN_CODE_TIMEOUT:
+                    print(id + ' timed out!')
+                    timeout.append(id)
+                    continue # we don't want to compare timeouts
+                else:
+                    print(f'{id} crashed! code={c}')
+                    crashed.append(id)
+            results_to_diff.append(errout)
+            timings.append(time)
+
+            if len(results_to_diff) <= 1:
+                continue
+
+            r0 = results_to_diff[0]
+            with open(results_file(id), 'a') as myfile:
+                myfile.write(package + '\n')
+                if id in crashed:
+                    myfile.write('Crash\n')
+                elif id in timeout:
+                    myfile.write('Timeout\n')
+                else:
+                    diff = lib.diff_results('0', r0, id, errout)
+                    if diff != '':
+                        myfile.write('diff:\n' + diff + '\n')
+                    myfile.write('time: %.1f %.1f\n' % (timings[0], time))
                 myfile.write('libraries:' + ','.join(libraries) +'\n')
-                myfile.write('diff:\n' + diff + '\n')
-
-        if not normal_crashed and not exhaustive_crashed:
-            with open(timing_file, 'a') as myfile:
-                package_width = '140'
-                timing_width = '>7'
-                myfile.write('{:{package_width}} {:{timing_width}} {:{timing_width}} {:{timing_width}}\n'.format(
-                    package, format_float(time_normal),
-                    format_float(time_exhaustive), format_float(time_normal, time_exhaustive),
-                    package_width=package_width, timing_width=timing_width))
-            with open(normal_results, 'a') as myfile:
-                myfile.write(results_to_diff[0])
-            with open(exhaustive_results, 'a') as myfile:
-                myfile.write(results_to_diff[1])
 
         packages_processed += 1
         print(str(packages_processed) + ' of ' + str(args.p) + ' packages processed\n')
 
-    with open(result_file, 'a') as myfile:
-        myfile.write('\n\ncrashes\n')
-        myfile.write('\n'.join(crashes))
-
-    with open(result_file, 'a') as myfile:
-        myfile.write('\n\ntimeouts\n')
-        myfile.write('\n'.join(timeouts) + '\n')
-
     print('Result saved to: ' + result_file)
diff --git a/tools/donate_cpu_lib.py b/tools/donate_cpu_lib.py
@@ -436,7 +436,7 @@ def __run_command(cmd, print_cmd=True):
     return return_code, stdout, stderr, elapsed_time
 
 
-def scan_package(cppcheck_path, source_path, libraries, capture_callstack=True, enable='style,information', debug_warnings=True, check_level=None):
+def scan_package(cppcheck_path, source_path, libraries, capture_callstack=True, enable='style,information', debug_warnings=True, check_level=None, extra_args=None):
     print('Analyze..')
     libs = ''
     for library in libraries:
@@ -453,6 +453,8 @@ def scan_package(cppcheck_path, source_path, libraries, capture_callstack=True,
         options += ' --disable=missingInclude --suppress=unmatchedSuppression'
     if check_level:
         options += ' --check-level=' + check_level
+    if extra_args:
+        options += ' ' + extra_args
     if debug_warnings:
         options += ' --check-library --debug-warnings --suppress=autoNoType --suppress=valueFlowBailout' \
                    ' --suppress=bailoutUninitVar --suppress=symbolDatabaseWarning --suppress=normalCheckLevelConditionExpressions'

Original file line number	Diff line number	Diff line change
`@@ -511,7 +511,8 @@ class CPPCHECKLIB WARN_UNUSED Settings {`
`511`	`511`	`return jobs == 1;`
`512`	`512`	`}`
`513`	`513`
`514`		`- enum class CheckLevel : std::uint8_t {`
	`514`	`+ enum class CheckLevel: std::uint8_t {`
	`515`	`+ reduced,`
`515`	`516`	`normal,`
`516`	`517`	`exhaustive`
`517`	`518`	`};`