[PATCH] D146387: [test-suite] Avoid segfault in CLAMR test on non-Linux systems

Dimitry Andric via Phabricator via llvm-commits llvm-commits at lists.llvm.org
Fri Mar 24 11:03:44 PDT 2023


This revision was automatically updated to reflect the committed changes.
Closed by commit rTccf81ff7776f: [test-suite] Avoid segfault in CLAMR test on non-Linux systems (authored by dim).

Repository:
  rT test-suite

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D146387/new/

https://reviews.llvm.org/D146387

Files:
  MultiSource/Benchmarks/DOE-ProxyApps-C++/CLAMR/clamr_cpuonly.cpp


Index: MultiSource/Benchmarks/DOE-ProxyApps-C++/CLAMR/clamr_cpuonly.cpp
===================================================================
--- MultiSource/Benchmarks/DOE-ProxyApps-C++/CLAMR/clamr_cpuonly.cpp
+++ MultiSource/Benchmarks/DOE-ProxyApps-C++/CLAMR/clamr_cpuonly.cpp
@@ -271,8 +271,8 @@
    mesh->parallel_output("CPU:  setup time               time was",cpu_time_main_setup, 0, "s");
    #endif 
 
-   long long mem_used = memstats_memused();
    #ifdef MEMORY
+   long long mem_used = memstats_memused();
    if (mem_used > 0) {
       mesh->parallel_output("Memory used      in startup ",mem_used, 0, "kB");
       mesh->parallel_output("Memory peak      in startup ",memstats_mempeak(), 0, "kB");
@@ -627,8 +627,8 @@
       //  Get overall program timing.
       double elapsed_time = cpu_timer_stop(tstart);
       
-      long long mem_used = memstats_memused();
       #ifdef MEMORY
+      long long mem_used = memstats_memused();
       if (mem_used > 0) {
          printf("Memory used      %lld kB\n",mem_used);
          printf("Memory peak      %lld kB\n",memstats_mempeak());


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D146387.508166.patch
Type: text/x-patch
Size: 1100 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20230324/f7927c27/attachment.bin>


More information about the llvm-commits mailing list