fixup2

Author: satanson

calltree.pl

@@ -307,6 +307,7 @@ ($)
 my $RE_SINGLE_LINE_COMMENT = qr'/[/\\].*';
 my $RE_LEFT_ANGLES = qr'<[<=]+';
 my $RE_TEMPLATE_ARGS_1LAYER = qr'(<\s*(((::)?(\w+::)*\w+\s*,\s*)*(::)?(\w+::)*\w+\s*)>)';
+my $RE_STD_FUNCTION = qr'(?:::\s*)?\b(?:\w+\s*::\s*)*(\w+)\s*<\s*\w+\s*\(\)\s*\>';
 my $RE_CSV_TOKEN = gen_re_list(",", $RE_SCOPED_IDENTIFIER, "??");
 my $RE_NOEXCEPT_THROW = qr"(\\b(noexcept|throw)\\b)(\\s*\\(\\s*$RE_CSV_TOKEN\\s*\\))?";
 my $RE_MACRO_DEF = qr/(#define([^\n\r]*\\(\n\r?|\r\n?))*([^\n\r]*[^\n\r\\])?((\n\r?)|(\r\n?)|$))/;
@@ -383,6 +384,10 @@ ($)
  ($_[0] =~ s/$RE_TEMPLATE_ARGS_1LAYER/&blank_lines($1)/gemr, $1);
 }
 
+sub replace_std_function($) {
+ $_[0] =~ s/$RE_STD_FUNCTION/$1/gr;
+}
+
 sub replace_seastar($) {
  $_[0] =~ s/^[\n ]*SEASTAR_CONCEPT.*$/ /gr;
 }
@@ -453,6 +458,7 @@ ($)
  $content = remove_keywords_and_attributes($content);
  $content = remove_gcc_attributes($content);
  $content = replace_template_args_4layers($content);
+ $content = replace_std_function($content);
  $content = remove_noexcept_and_throw($content);
  $content = remove_noexcept($content);
  $content = replace_macro_defs($content);

sr_index2.pl

@@ -134,7 +134,7 @@ ($)
  next;
  }
 
- if (/\b(ActiveTime|DriverTotalTime|OverheadTime|ScheduleTime|PendingTime|InputEmptyTime|FirstInputEmptyTime|FollowupInputEmptyTime|OutputFullTime|PreconditionBlockTime):\s+(\S+)/) {
+ if (/\b(ActiveTime|__MAX_OF_DriverPrepareTime|DriverPrepareTime|DriverTotalTime|OverheadTime|ScheduleTime|PendingTime|InputEmptyTime|FirstInputEmptyTime|FollowupInputEmptyTime|OutputFullTime|PreconditionBlockTime):\s+(\S+)/) {
  $plan->{$fragment}{pipelines}{$pipeline}{$1}=norm_time($2);
  next;
  }

unittest/util_test.cc

@@ -10,6 +10,7 @@
 #include <gtest/gtest.h>
 #include <immintrin.h>
 #include <mmintrin.h>
+#include <glog/logging.h>
 
 #include <random>
 #include <util/bits_op.hh>
@@ -215,6 +216,39 @@ TEST_F(TestUtil, testHexDecode) {
  ASSERT_EQ(r1, r0);
  ASSERT_EQ(r0, r2);
 }
+template<typename Func>
+struct WithArg0 {
+ template<int N>
+ struct Functor {
+ void operator()(int m) {
+ std::cout<<Func()(m,N)<<std::endl;
+ }
+ };
+};
+template<template<int> typename F, typename ... Args>
+void dispatch(int n, Args&&...args){
+ switch(n){
+ case 0:
+ return F<0>()(std::forward<Args>(args)...);
+ case 1:
+ return F<1>()(std::forward<Args>(args)...);
+ case 2:
+ return F<2>()(std::forward<Args>(args)...);
+ default:
+ CHECK(false) << "Unknown type: " << n;
+ __builtin_unreachable();
+ }
+}
+struct Add{
+ int operator()(int n, int m) {return n+m;}
+};
+struct Multiply{
+ int operator()(int n, int m) {return n*m;}
+};
+TEST_F(TestUtil, testCurrying) {
+ dispatch<WithArg0<Add>::Functor>(2, 10);
+ dispatch<WithArg0<Multiply>::Functor>(2, 10);
+}
 
 } // namespace util
 } // namespace grakra