API tools faq
paste
Advertisement
Guest User

Untitled

a guest
Aug 26th, 2019
105
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
JavaScript 16.41 KB | None | 0 0
raw download clone embed print report
  1. diff --git a/memtest.py b/memtest.py
  2. index 991912c..8ff4e6a 100644
  3. --- a/memtest.py
  4. +++ b/memtest.py
  5. @@ -135,47 +135,3 @@ class StackTestJerry:
  6.  
  7.          return -1, 0
  8.  
  9. -
  10. -class RSSTestJerry:
  11. -    def __init__(self, log_file, verbose=False, test_dir='', script=''):
  12. -        self.log_file = log_file
  13. -        self.verbose = verbose
  14. -        self.test_dir = test_dir
  15. -        self.script = script
  16. -
  17. -    def run(self, runnable, test_name='', test_dir=''):
  18. -        if test_dir:
  19. -            test_path = os.path.join(test_dir, test_name)
  20. -        else:
  21. -            test_path = os.path.join(self.test_dir, test_name)
  22. -
  23. -        self.log_file.write('Start RSS test on ' + test_name + '\n')
  24. -        if self.verbose:
  25. -            out_file = self.log_file
  26. -        else:
  27. -            out_file = open('/dev/null', 'w')
  28. -
  29. -        #out_file.write('test_path: ' +  test_path + '\n')
  30. -        #out_file.write('stdout:\n')
  31. -
  32. -        rss_value = 0
  33. -        num_of_measure = 7
  34. -        for i in range(0, num_of_measure):
  35. -            try:
  36. -                return_value = subprocess.check_output([self.script, runnable, test_path], stderr=self.log_file)
  37. -            except subprocess.CalledProcessError as e:
  38. -                out_file.write(e.output)
  39. -                self.log_file.write('Process finished with ' + str(e.returncode) + ' return code.\n')
  40. -                return -1, e.returncode
  41. -
  42. -            # Strip the newline from the script's output
  43. -            return_value = return_value.rstrip()
  44. -            # Change the unit from kilobytes to bytes
  45. -            return_value = int(return_value) * 1024
  46. -
  47. -            rss_value += return_value
  48. -
  49. -        rss_value = int(rss_value / num_of_measure)
  50. -        out_file.write(str(rss_value))
  51. -
  52. -        return rss_value, 0
  53. diff --git a/tape_measure.py b/tape_measure.py
  54. index 0b43abb..fcf9fab 100755
  55. --- a/tape_measure.py
  56. +++ b/tape_measure.py
  57. @@ -11,7 +11,6 @@ from perftest import PerfTest
  58. from memtest import MemTest
  59. from memtest import MemTestJerry
  60. from memtest import StackTestJerry
  61. -from memtest import RSSTestJerry
  62. from readelf import ReadElf
  63.  
  64. def collect_tests_from_directory(path):
  65. @@ -63,14 +62,12 @@ def fancy_output(result, options, log_file=sys.stdout):
  66.         log_file.write('{type:20}|{size:10,}\n'.format(type='DATA', size=size_data))
  67.         log_file.write('{type:20}|{size:10,}\n'.format(type='BSS', size=size_bss))
  68.  
  69. -    if options.memory or options.stack or options.rss or options.performance or options.run_all:
  70. +    if options.memory or options.stack or options.performance or options.run_all:
  71.         line = '{name:30}'.format(name='test name')
  72.         if options.memory or options.run_all:
  73.             line += '|{peak:10}'.format(peak='heap')
  74.         if options.stack or options.run_all:
  75.             line += '|{peak:10}'.format(peak='stack')
  76. -        if options.rss or options.run_all:
  77. -            line += '|{peak:10}'.format(peak='rss')
  78.         if options.performance or options.run_all:
  79.             line += '|{avg:10}|{std_dev:10}'.format(avg='avg', std_dev='std_dev')
  80.         log_file.write(line + '\n')
  81. @@ -81,8 +78,6 @@ def fancy_output(result, options, log_file=sys.stdout):
  82.             tst_res = result['test_results_mem']
  83.         elif options.stack:
  84.             tst_res = result['test_results_stack']
  85. -        elif options.rss:
  86. -            tst_res = result['test_results_rss']
  87.  
  88.         for index, test in enumerate(tst_res):
  89.             line =  '{name:30}'.format(name=test['test'])
  90. @@ -90,8 +85,6 @@ def fancy_output(result, options, log_file=sys.stdout):
  91.                 line += '|{peak:10}'.format(peak=result['test_results_mem'][index]['memory_peak'])
  92.             if options.stack or options.run_all:
  93.                 line += '|{peak:10}'.format(peak=result['test_results_stack'][index]['max_stack'])
  94. -            if options.rss or options.run_all:
  95. -                line += '|{peak:10}'.format(peak=result['test_results_rss'][index]['max_rss'])
  96.             if options.performance or options.run_all:
  97.                 line += '|{avg:10}|{std_dev:10.4}'.format(avg=test['avg_time'], std_dev=float(test['std_deviation']))
  98.             line += '\n'
  99. @@ -140,8 +133,6 @@ if __name__ == '__main__':
  100.         help="comment for the measurements")
  101.     parser.add_option("--remote", action="store", dest="remote", default='',
  102.         help="information about the remote")
  103. -    parser.add_option("--rss", action="store", dest="rss", default='',
  104. -        help="path of the RSS script")
  105.  
  106.     (options, args) = parser.parse_args()
  107.  
  108. @@ -191,17 +182,12 @@ if __name__ == '__main__':
  109.     else:
  110.         stacktest = None
  111.  
  112. -    if options.rss or options.run_all:
  113. -        rsstest = RSSTestJerry(log_file, options.verbose, options.test_dir, options.rss)
  114. -    else:
  115. -        rsstest = None
  116. -
  117.     if options.performance or options.run_all:
  118.         perftest = PerfTest(log_file, options.verbose, options.test_dir)
  119.     else:
  120.         perftest = None
  121.  
  122. -    if memtest or stacktest or rsstest or perftest:
  123. +    if memtest or stacktest or perftest:
  124.         if options.test_list:
  125.             test_list = collect_tests(options.test_list.split())
  126.         else:
  127. @@ -216,7 +202,6 @@ if __name__ == '__main__':
  128.  
  129.         test_results_mem = []
  130.         test_results_stack = []
  131. -        test_results_rss = []
  132.         test_results_perf = []
  133.  
  134.         for test in test_list:
  135. @@ -232,12 +217,6 @@ if __name__ == '__main__':
  136.                 stack_result['max_stack'] = peak
  137.                 stack_result['exit_code'] = exit_code
  138.                 test_results_stack.append(stack_result)
  139. -            if rsstest:
  140. -                rss_result = { 'test' : test}
  141. -                peak, exit_code = rsstest.run(runnable, test)
  142. -                rss_result['max_rss'] = peak
  143. -                rss_result['exit_code'] = exit_code
  144. -                test_results_rss.append(rss_result)
  145.             if perftest:
  146.                 perf_result = { 'test' : test}
  147.                 time, std_deviation, exit_code = perftest.run(runnable, test)
  148. @@ -252,9 +231,6 @@ if __name__ == '__main__':
  149.     if stacktest:
  150.         result['test_results_stack'] = test_results_stack
  151.  
  152. -    if rsstest:
  153. -        result['test_results_rss'] = test_results_rss
  154. -
  155.     if perftest:
  156.         result['test_results_perf'] = test_results_perf
  157.  
  158. diff --git a/web_chart/compare_view.html b/web_chart/compare_view.html
  159. index e9b81d7..348a5fb 100644
  160. --- a/web_chart/compare_view.html
  161. +++ b/web_chart/compare_view.html
  162. @@ -37,7 +37,6 @@ textarea {
  163.   <div>
  164.     <input type="checkbox" id="check_heap" value="heap"> Memory peak
  165.     <input type="checkbox" id="check_stack" value="stack" checked> Max stack
  166. -    <input type="checkbox" id="check_rss" value="rss" checked> Max RSS
  167.     <input type="checkbox" id="check_perf" value="perf" checked> Runtime <br>
  168.   </div>
  169.   <input type="submit" value="Generate" onclick="generate_markdown()">
  170. diff --git a/web_chart/index.html b/web_chart/index.html
  171. index 8a91bb6..aea6624 100644
  172. --- a/web_chart/index.html
  173. +++ b/web_chart/index.html
  174. @@ -183,10 +183,6 @@
  175.       <td>Max stack</td>
  176.       <td><span id="commit_stack"></span></td>
  177.     </tr>
  178. -    <tr>
  179. -      <td>Max RSS</td>
  180. -      <td><span id="commit_rss"></span></td>
  181. -    </tr>
  182.     <tr>
  183.       <td>Runtime</td>
  184.       <td><span id="commit_runtime"></span></td>
  185. diff --git a/web_chart/js/compare.js b/web_chart/js/compare.js
  186. index f026e05..632abe2 100644
  187. --- a/web_chart/js/compare.js
  188. +++ b/web_chart/js/compare.js
  189. @@ -38,7 +38,6 @@ function create_compare_table(data) {
  190.         insert_cell(row, baseline.test_results[i].test, 'compare-table');
  191.         insert_cell(row, baseline.test_results[i].memory_peak, 'compare-table compare-table-data left-border');
  192.         insert_cell(row, baseline.test_results[i].max_stack, 'compare-table compare-table-data left-border');
  193. -        insert_cell(row, baseline.test_results[i].max_rss, 'compare-table compare-table-data left-border');
  194.         insert_cell(row, baseline.test_results[i].avg_time.toFixed(3), 'compare-table compare-table-data right-border');
  195.     }
  196.  
  197. @@ -51,7 +50,6 @@ function create_compare_table(data) {
  198.             var row = rows[j];
  199.             insert_cell(row, test_result.memory_peak, 'compare-table compare-table-data left-border');
  200.             insert_cell(row, test_result.max_stack, 'compare-table compare-table-data left-border');
  201. -            insert_cell(row, test_result.max_rss, 'compare-table compare-table-data left-border');
  202.             insert_cell(row, test_result.avg_time.toFixed(3), 'compare-table compare-table-data');
  203.  
  204.             var percentage_class = 'compare-table compare-table-data ';
  205. @@ -60,8 +58,6 @@ function create_compare_table(data) {
  206.             insert_cell(row, format_percentage(test_result.memory_gain_percentage), percentage_class + color);
  207.             color = percentage_color(test_result.stack_gain_percentage);
  208.             insert_cell(row, format_percentage(test_result.stack_gain_percentage), percentage_class + color);
  209. -            color = percentage_color(test_result.rss_gain_percentage);
  210. -            insert_cell(row, format_percentage(test_result.rss_gain_percentage), percentage_class + color);
  211.             color = percentage_color(test_result.avg_time_gain_percentage, test_result.avg_time, test_result.std_deviation);
  212.             insert_cell(row, format_percentage(test_result.avg_time_gain_percentage), percentage_class + color + 'right-border');
  213.         }
  214. @@ -73,7 +69,6 @@ function create_compare_table(data) {
  215. function generate_markdown() {
  216.     var need_heap = document.getElementById("check_heap").checked;
  217.     var need_stack = document.getElementById("check_stack").checked;
  218. -    var need_rss = document.getElementById("check_rss").checked;
  219.     var need_perf = document.getElementById("check_perf").checked;
  220.     var columns = [];
  221.     var markdown_result = "Benchmark |";
  222. @@ -89,11 +84,6 @@ function generate_markdown() {
  223.         count++;
  224.         columns.push('max_stack');
  225.     }
  226. -    if (need_rss) {
  227. -        markdown_result += " RSS(bytes) |";
  228. -        count++;
  229. -        columns.push('max_rss');
  230. -    }
  231.     if (need_perf) {
  232.         markdown_result += " Perf(sec) |";
  233.         count++;
  234. @@ -176,7 +166,6 @@ function create_header(data, table) {
  235.     insert_cell(second_row, 'Sunspider test name', 'compare-table-header');
  236.     insert_cell(second_row, 'Memory peak<br>(bytes)', 'compare-table-header left-border compare-table-header-unit');
  237.     insert_cell(second_row, 'Max stack<br>(bytes)', 'compare-table-header left-border compare-table-header-unit');
  238. -    insert_cell(second_row, 'Max RSS<br>(bytes)', 'compare-table-header left-border compare-table-header-unit');
  239.     insert_cell(second_row, 'Runtime<br>(sec)', 'compare-table-header right-border compare-table-header-unit');
  240.  
  241.     measurements = data.compared_measurements;
  242. @@ -185,11 +174,9 @@ function create_header(data, table) {
  243.  
  244.         insert_cell(second_row, 'Memory peak<br>(bytes)', 'compare-table-header left-border compare-table-header-unit');
  245.         insert_cell(second_row, 'Max stack<br>(bytes)', 'compare-table-header left-border compare-table-header-unit');
  246. -        insert_cell(second_row, 'Max RSS<br>(bytes)', 'compare-table-header left-border compare-table-header-unit');
  247.         insert_cell(second_row, 'Runtime<br>(sec)', 'compare-table-header compare-table-header-unit');
  248.         insert_cell(second_row, 'Memory gain<br>(percentage)', 'compare-table-header compare-table-header-unit');
  249.         insert_cell(second_row, 'Stack gain<br>(percentage)', 'compare-table-header compare-table-header-unit');
  250. -        insert_cell(second_row, 'RSS gain<br>(percentage)', 'compare-table-header compare-table-header-unit');
  251.         insert_cell(second_row, 'Runtime gain<br>(percentage)', 'compare-table-header right-border compare-table-header-unit');
  252.     }
  253. }
  254. diff --git a/web_chart/js/utils.js b/web_chart/js/utils.js
  255. index 20b1172..e8556ab 100644
  256. --- a/web_chart/js/utils.js
  257. +++ b/web_chart/js/utils.js
  258. @@ -60,9 +60,6 @@ function current_test() {
  259.        case 'aggregated stack':
  260.             test = 'stack';
  261.             break;
  262. -       case 'aggregated rss':
  263. -            test = 'rss';
  264. -            break;
  265.        case 'aggregated runtime':
  266.             test = 'runtime';
  267.             break;
  268. @@ -85,10 +82,6 @@ function test_is_stack(test) {
  269.     return test == 'stack';
  270. }
  271.  
  272. -function test_is_rss(test) {
  273. -    return test == 'rss';
  274. -}
  275. -
  276. function test_is_runtime(test) {
  277.     return test == 'runtime';
  278. }
  279. diff --git a/web_chart/js/web_chart.js b/web_chart/js/web_chart.js
  280. index c265f49..548a3e0 100644
  281. --- a/web_chart/js/web_chart.js
  282. +++ b/web_chart/js/web_chart.js
  283. @@ -56,7 +56,6 @@ String.prototype.lpad = function(padString, length) {
  284. function draw_chart(data, selected_test) {
  285.     var memory_peak = [];
  286.     var max_stack = [];
  287. -    var max_rss = [];
  288.     var runtime_avg = [];
  289.     var ticks = [];
  290.     var section_size = [];
  291. @@ -68,7 +67,6 @@ function draw_chart(data, selected_test) {
  292.             if (result.test == selected_test) {
  293.                 memory_peak.push(result.memory_peak);
  294.                 max_stack.push(result.max_stack);
  295. -                max_rss.push(result.max_rss);
  296.                 runtime_avg.push(result.avg_time);
  297.                 break;
  298.             }
  299. @@ -135,8 +133,8 @@ function draw_chart(data, selected_test) {
  300.     if (plot1)
  301.         plot1.destroy();
  302.  
  303. -    if (memory_peak.length || max_stack.length || max_rss.length || runtime_avg.length)
  304. -        plot1 = $.jqplot ('chart1', [memory_peak, max_stack, max_rss, runtime_avg], plot_options);
  305. +    if (memory_peak.length || max_stack.length || runtime_avg.length)
  306. +        plot1 = $.jqplot ('chart1', [memory_peak, max_stack, runtime_avg], plot_options);
  307.  
  308.     $('#chart1').unbind('jqplotDataClick');
  309.     $('#chart1').bind('jqplotDataClick',
  310. @@ -167,10 +165,8 @@ function draw_chart_aggregated(data, type) {
  311.                 test_results[current_test.test].push(current_test.avg_time);
  312.             else if (type == 'memory')
  313.                 test_results[current_test.test].push(current_test.memory_peak);
  314. -            else if (type == 'stack')
  315. +            else // type == 'stack'
  316.                 test_results[current_test.test].push(current_test.max_stack);
  317. -            else // type == 'rss'
  318. -                test_results[current_test.test].push(current_test.max_rss);
  319.         }
  320.         size = 0;
  321.         for (j in measurement.sections) {
  322. @@ -325,11 +321,10 @@ function show_commit_info(ev, seriesIndex, pointIndex, value, data, aggregated)
  323.         commit_message = 'Commit message is missing!';
  324.     var measurement = data.results[pointIndex];
  325.  
  326. -    var sum = { memory: 0, stack: 0, rss: 0, runtime: 0 };
  327. +    var sum = { memory: 0, stack: 0, runtime: 0 };
  328.     $.each(measurement.test_results, function(key, test) {
  329.         sum.memory += test.memory_peak;
  330.         sum.stack += test.max_stack;
  331. -        sum.rss += test.max_rss;
  332.         sum.runtime += test.avg_time;
  333.     });
  334.  
  335. @@ -338,7 +333,6 @@ function show_commit_info(ev, seriesIndex, pointIndex, value, data, aggregated)
  336.     $('#commit_date').html(nice_date(measurement.commit.timestamp));
  337.     $('#commit_memory').html(sum.memory.toLocaleString() + ' bytes');
  338.     $('#commit_stack').html(sum.stack.toLocaleString() + ' bytes');
  339. -    $('#commit_rss').html(sum.rss.toLocaleString() + ' bytes');
  340.     $('#commit_runtime').html(sum.runtime.toFixed(3) + ' sec');
  341.     $('#commit_size').html(data.section_size[pointIndex].toLocaleString() + ' bytes');
  342.     $('#commit_message').html(format_commit_message(commit_message));
  343. @@ -394,7 +388,7 @@ function async_draw_chart(data, test) {
  344.     if (test_is_codesize(test)) {
  345.         draw_size_chart(data);
  346.     }
  347. -    else if (test_is_runtime(test) || test_is_memory(test) || test_is_stack(test) || test_is_rss(test)) {
  348. +    else if (test_is_runtime(test) || test_is_memory(test) || test_is_stack(test)) {
  349.         draw_chart_aggregated(data, test);
  350.     }
  351.     else {
  352. @@ -513,7 +507,7 @@ function update_navbar() {
  353.     update_selector('remote-selector', remote_list)
  354.     bind_selector('remote-selector');
  355.  
  356. -    var test_selector_list = ['aggregated memory', 'aggregated stack', 'aggregated rss', 'aggregated runtime', 'code size'].concat(test_list);
  357. +    var test_selector_list = ['aggregated memory', 'aggregated stack', 'aggregated runtime', 'code size'].concat(test_list);
  358.  
  359.     update_selector('test-selector', test_selector_list);
  360.     bind_selector('test-selector');
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!