src/cpu/ppc/vm/vm_version_ppc.cpp

rev 13439 : Martin's 8185979: PPC64: Implement SHA2 intrinsic

*** 111,121 ****
  #endif
  
    // Create and print feature-string.
    char buf[(num_features+1) * 16]; // Max 16 chars per feature.
    jio_snprintf(buf, sizeof(buf),
!                "ppc64%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s",
                 (has_fsqrt()   ? " fsqrt"   : ""),
                 (has_isel()    ? " isel"    : ""),
                 (has_lxarxeh() ? " lxarxeh" : ""),
                 (has_cmpb()    ? " cmpb"    : ""),
                 //(has_mftgpr()? " mftgpr"  : ""),
--- 111,121 ----
  #endif
  
    // Create and print feature-string.
    char buf[(num_features+1) * 16]; // Max 16 chars per feature.
    jio_snprintf(buf, sizeof(buf),
!                "ppc64%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s",
                 (has_fsqrt()   ? " fsqrt"   : ""),
                 (has_isel()    ? " isel"    : ""),
                 (has_lxarxeh() ? " lxarxeh" : ""),
                 (has_cmpb()    ? " cmpb"    : ""),
                 //(has_mftgpr()? " mftgpr"  : ""),
*** 128,138 ****
                 (has_vpmsumb() ? " vpmsumb" : ""),
                 (has_tcheck()  ? " tcheck"  : ""),
                 (has_mfdscr()  ? " mfdscr"  : ""),
                 (has_vsx()     ? " vsx"     : ""),
                 (has_ldbrx()   ? " ldbrx"   : ""),
!                (has_stdbrx()  ? " stdbrx"  : "")
                 // Make sure number of %s matches num_features!
                );
    _features_string = os::strdup(buf);
    if (Verbose) {
      print_features();
--- 128,139 ----
                 (has_vpmsumb() ? " vpmsumb" : ""),
                 (has_tcheck()  ? " tcheck"  : ""),
                 (has_mfdscr()  ? " mfdscr"  : ""),
                 (has_vsx()     ? " vsx"     : ""),
                 (has_ldbrx()   ? " ldbrx"   : ""),
!                (has_stdbrx()  ? " stdbrx"  : ""),
!                (has_vshasig() ? " sha"     : "")
                 // Make sure number of %s matches num_features!
                );
    _features_string = os::strdup(buf);
    if (Verbose) {
      print_features();
*** 245,265 ****
  
    if (FLAG_IS_DEFAULT(UseFMA)) {
      FLAG_SET_DEFAULT(UseFMA, true);
    }
  
!   if (UseSHA) {
      warning("SHA instructions are not available on this CPU");
      FLAG_SET_DEFAULT(UseSHA, false);
    }
!   if (UseSHA1Intrinsics || UseSHA256Intrinsics || UseSHA512Intrinsics) {
!     warning("SHA intrinsics are not available on this CPU");
      FLAG_SET_DEFAULT(UseSHA1Intrinsics, false);
      FLAG_SET_DEFAULT(UseSHA256Intrinsics, false);
      FLAG_SET_DEFAULT(UseSHA512Intrinsics, false);
    }
  
    if (FLAG_IS_DEFAULT(UseMultiplyToLenIntrinsic)) {
      UseMultiplyToLenIntrinsic = true;
    }
    if (FLAG_IS_DEFAULT(UseMontgomeryMultiplyIntrinsic)) {
      UseMontgomeryMultiplyIntrinsic = true;
--- 246,292 ----
  
    if (FLAG_IS_DEFAULT(UseFMA)) {
      FLAG_SET_DEFAULT(UseFMA, true);
    }
  
!   if (has_vshasig()) {
!     if (FLAG_IS_DEFAULT(UseSHA)) {
!       UseSHA = true;
!     }
!   } else if (UseSHA) {
!     if (!FLAG_IS_DEFAULT(UseSHA))
        warning("SHA instructions are not available on this CPU");
      FLAG_SET_DEFAULT(UseSHA, false);
    }
! 
!   if (UseSHA1Intrinsics) {
!     warning("Intrinsics for SHA-1 crypto hash functions not available on this CPU.");
      FLAG_SET_DEFAULT(UseSHA1Intrinsics, false);
+   }
+ 
+   if (UseSHA && has_vshasig()) {
+     if (FLAG_IS_DEFAULT(UseSHA256Intrinsics)) {
+       FLAG_SET_DEFAULT(UseSHA256Intrinsics, true);
+     }
+   } else if (UseSHA256Intrinsics) {
+     warning("Intrinsics for SHA-224 and SHA-256 crypto hash functions not available on this CPU.");
      FLAG_SET_DEFAULT(UseSHA256Intrinsics, false);
+   }
+ 
+   if (UseSHA && has_vshasig()) {
+     if (FLAG_IS_DEFAULT(UseSHA512Intrinsics)) {
+       FLAG_SET_DEFAULT(UseSHA512Intrinsics, true);
+     }
+   } else if (UseSHA512Intrinsics) {
+     warning("Intrinsics for SHA-384 and SHA-512 crypto hash functions not available on this CPU.");
      FLAG_SET_DEFAULT(UseSHA512Intrinsics, false);
    }
  
+   if (!(UseSHA1Intrinsics || UseSHA256Intrinsics || UseSHA512Intrinsics)) {
+     FLAG_SET_DEFAULT(UseSHA, false);
+   }
+ 
    if (FLAG_IS_DEFAULT(UseMultiplyToLenIntrinsic)) {
      UseMultiplyToLenIntrinsic = true;
    }
    if (FLAG_IS_DEFAULT(UseMontgomeryMultiplyIntrinsic)) {
      UseMontgomeryMultiplyIntrinsic = true;
*** 655,664 ****
--- 682,692 ----
    a->tcheck(0);                                // code[12] -> tcheck
    a->mfdscr(R0);                               // code[13] -> mfdscr
    a->lxvd2x(VSR0, R3_ARG1);                    // code[14] -> vsx
    a->ldbrx(R7, R3_ARG1, R4_ARG2);              // code[15] -> ldbrx
    a->stdbrx(R7, R3_ARG1, R4_ARG2);             // code[16] -> stdbrx
+   a->vshasigmaw(VR0, VR1, 1, 0xF);             // code[17] -> vshasig
    a->blr();
  
    // Emit function to set one cache line to zero. Emit function descriptor and get pointer to it.
    void (*zero_cacheline_func_ptr)(char*) = (void(*)(char*))(void *)a->function_entry();
    a->dcbz(R3_ARG1); // R3_ARG1 = addr
*** 706,715 ****
--- 734,744 ----
    if (code[feature_cntr++]) features |= tcheck_m;
    if (code[feature_cntr++]) features |= mfdscr_m;
    if (code[feature_cntr++]) features |= vsx_m;
    if (code[feature_cntr++]) features |= ldbrx_m;
    if (code[feature_cntr++]) features |= stdbrx_m;
+   if (code[feature_cntr++]) features |= vshasig_m;
  
    // Print the detection code.
    if (PrintAssembly) {
      ttyLocker ttyl;
      tty->print_cr("Decoding cpu-feature detection stub at " INTPTR_FORMAT " after execution:", p2i(code));