src/share/vm/c1/c1_GraphBuilder.cpp

rev 5411 : 8026251: New type profiling points: parameters to methods
Summary: x86 interpreter and c1 type profiling for parameters on method entries
Reviewed-by:

*** 1670,1700 ****
    assert(DeoptC1, "need debug information");
    return compilation()->dependency_recorder();
  }
  
  // How many arguments do we want to profile?
! Values* GraphBuilder::args_list_for_profiling(int& start, bool may_have_receiver) {
    int n = 0;
!   assert(start == 0, "should be initialized");
    if (MethodData::profile_arguments()) {
      ciProfileData* data = method()->method_data()->bci_to_data(bci());
      if (data->is_CallTypeData() || data->is_VirtualCallTypeData()) {
        n = data->is_CallTypeData() ? data->as_CallTypeData()->number_of_arguments() : data->as_VirtualCallTypeData()->number_of_arguments();
!       bool has_receiver = may_have_receiver && Bytecodes::has_receiver(method()->java_code_at_bci(bci()));
!       start = has_receiver ? 1 : 0;
      }
    }
    if (n > 0) {
      return new Values(n);
    }
    return NULL;
  }
  
  // Collect arguments that we want to profile in a list
! Values* GraphBuilder::collect_args_for_profiling(Values* args, bool may_have_receiver) {
    int start = 0;
!   Values* obj_args = args_list_for_profiling(start, may_have_receiver);
    if (obj_args == NULL) {
      return NULL;
    }
    int s = obj_args->size();
    for (int i = start, j = 0; j < s; i++) {
--- 1670,1704 ----
    assert(DeoptC1, "need debug information");
    return compilation()->dependency_recorder();
  }
  
  // How many arguments do we want to profile?
! Values* GraphBuilder::args_list_for_profiling(ciMethod* target, int& start, bool may_have_receiver) {
    int n = 0;
!   bool has_receiver = may_have_receiver && Bytecodes::has_receiver(method()->java_code_at_bci(bci()));
!   start = has_receiver ? 1 : 0;
    if (MethodData::profile_arguments()) {
      ciProfileData* data = method()->method_data()->bci_to_data(bci());
      if (data->is_CallTypeData() || data->is_VirtualCallTypeData()) {
        n = data->is_CallTypeData() ? data->as_CallTypeData()->number_of_arguments() : data->as_VirtualCallTypeData()->number_of_arguments();
!     }
!   }
!   if (MethodData::profile_parameters() && target != NULL) {
!     if (target->method_data() != NULL && target->method_data()->parameters_type_data() != NULL) {
!       n = MAX2(n, target->method_data()->parameters_type_data()->number_of_parameters() - start);
      }
    }
    if (n > 0) {
      return new Values(n);
    }
    return NULL;
  }
  
  // Collect arguments that we want to profile in a list
! Values* GraphBuilder::collect_args_for_profiling(Values* args, ciMethod* target, bool may_have_receiver) {
    int start = 0;
!   Values* obj_args = args_list_for_profiling(target, start, may_have_receiver);
    if (obj_args == NULL) {
      return NULL;
    }
    int s = obj_args->size();
    for (int i = start, j = 0; j < s; i++) {
*** 2004,2014 ****
        if (cha_monomorphic_target != NULL) {
          target_klass = cha_monomorphic_target->holder();
        } else if (exact_target != NULL) {
          target_klass = exact_target->holder();
        }
!       profile_call(target, recv, target_klass, collect_args_for_profiling(args, false), false);
      }
    }
  
    Invoke* result = new Invoke(code, result_type, recv, args, vtable_index, target, state_before);
    // push result
--- 2008,2018 ----
        if (cha_monomorphic_target != NULL) {
          target_klass = cha_monomorphic_target->holder();
        } else if (exact_target != NULL) {
          target_klass = exact_target->holder();
        }
!       profile_call(target, recv, target_klass, collect_args_for_profiling(args, NULL, false), false);
      }
    }
  
    Invoke* result = new Invoke(code, result_type, recv, args, vtable_index, target, state_before);
    // push result
*** 3559,3569 ****
          Value recv = NULL;
          if (has_receiver) {
            recv = args->at(0);
            null_check(recv);
          }
!         profile_call(callee, recv, NULL, collect_args_for_profiling(args, true), true);
        }
      }
    }
  
    Intrinsic* result = new Intrinsic(result_type, id, args, has_receiver, state_before,
--- 3563,3573 ----
          Value recv = NULL;
          if (has_receiver) {
            recv = args->at(0);
            null_check(recv);
          }
!         profile_call(callee, recv, NULL, collect_args_for_profiling(args, callee, true), true);
        }
      }
    }
  
    Intrinsic* result = new Intrinsic(result_type, id, args, has_receiver, state_before,
*** 3818,3828 ****
      // this may be redundant here...
      compilation()->set_would_profile(true);
  
      if (profile_calls()) {
        int start = 0;
!       Values* obj_args = args_list_for_profiling(start, has_receiver);
        if (obj_args != NULL) {
          int s = obj_args->size();
          // if called through method handle invoke, some arguments may have been popped
          for (int i = args_base+start, j = 0; j < obj_args->size() && i < state()->stack_size(); ) {
            Value v = state()->stack_at_inc(i);
--- 3822,3832 ----
      // this may be redundant here...
      compilation()->set_would_profile(true);
  
      if (profile_calls()) {
        int start = 0;
!       Values* obj_args = args_list_for_profiling(callee, start, has_receiver);
        if (obj_args != NULL) {
          int s = obj_args->size();
          // if called through method handle invoke, some arguments may have been popped
          for (int i = args_base+start, j = 0; j < obj_args->size() && i < state()->stack_size(); ) {
            Value v = state()->stack_at_inc(i);