revised patch for hp-timing.h

Message ID 5eaed0800f8741658abb9073693660dd@amazon.com
State Superseded
Headers
Series revised patch for hp-timing.h |

Checks

Context Check Description
dj/TryBot-apply_patch fail Patch failed to apply to master at the time it was sent
dj/TryBot-32bit fail Patch series failed to apply

Commit Message

develop--- via Libc-alpha Jan. 31, 2023, 5:19 p.m. UTC
  I have revised the patch to fix the hp-timing.h bug (bug 29329<https://sourceware.org/bugzilla/show_bug.cgi?id=29329>).

Regards,

Jun


```
  

Comments

Carlos O'Donell Jan. 31, 2023, 10:38 p.m. UTC | #1
On 1/31/23 12:19, Tang, Jun via Libc-alpha wrote:
> I have revised the patch to fix the hp-timing.h bug (bug 29329<https://sourceware.org/bugzilla/show_bug.cgi?id=29329>).

Thanks for sending the new version.

Out of curiosity, how are you sending the patch to the mailing list?

The CI/CD system can't apply the patch as it would expect:
https://patchwork.sourceware.org/project/glibc/patch/5eaed0800f8741658abb9073693660dd@amazon.com/
 
> Regards,
> 
> Jun
> 
> 
> ```
> diff --git a/sysdeps/aarch64/hp-timing.h b/sysdeps/aarch64/hp-timing.h
> index f7f7ac7cae..c699effe6a 100644
> --- a/sysdeps/aarch64/hp-timing.h
> +++ b/sysdeps/aarch64/hp-timing.h
> @@ -41,7 +41,7 @@ typedef uint64_t hp_timing_t;
> #define HP_TIMING_DIFF(Diff, Start, End)                       \
> ({  hp_timing_t freq;                                          \
>      __asm__ __volatile__ ("mrs %0, cntfrq_el0" : "=r" (freq)); \
> -   (Diff) = ((End) - (Start)) * (UINT64_C(1000000000) / freq); \
> +   (Diff) = (((End) - (Start)) * UINT64_C(1000000000)) / freq; \
> })
>  #endif /* hp-timing.h */
> ```
  
develop--- via Libc-alpha Jan. 31, 2023, 10:50 p.m. UTC | #2
Carlos,

Can you try apply the attached patch file instead?  Thanks,

Jun

-----Original Message-----
From: Carlos O'Donell <carlos@redhat.com> 
Sent: Tuesday, January 31, 2023 4:38 PM
To: Tang, Jun <juntangc@amazon.com>; GNU libc development <libc-alpha@sourceware.org>; DJ Delorie <dj@redhat.com>
Subject: RE: [EXTERNAL]revised patch for hp-timing.h

CAUTION: This email originated from outside of the organization. Do not click links or open attachments unless you can confirm the sender and know the content is safe.



On 1/31/23 12:19, Tang, Jun via Libc-alpha wrote:
> I have revised the patch to fix the hp-timing.h bug (bug 29329<https://sourceware.org/bugzilla/show_bug.cgi?id=29329>).

Thanks for sending the new version.

Out of curiosity, how are you sending the patch to the mailing list?

The CI/CD system can't apply the patch as it would expect:
https://patchwork.sourceware.org/project/glibc/patch/5eaed0800f8741658abb9073693660dd@amazon.com/

> Regards,
>
> Jun
>
>
> ```
> diff --git a/sysdeps/aarch64/hp-timing.h b/sysdeps/aarch64/hp-timing.h 
> index f7f7ac7cae..c699effe6a 100644
> --- a/sysdeps/aarch64/hp-timing.h
> +++ b/sysdeps/aarch64/hp-timing.h
> @@ -41,7 +41,7 @@ typedef uint64_t hp_timing_t;
> #define HP_TIMING_DIFF(Diff, Start, End)                       \
> ({  hp_timing_t freq;                                          \
>      __asm__ __volatile__ ("mrs %0, cntfrq_el0" : "=r" (freq)); \
> -   (Diff) = ((End) - (Start)) * (UINT64_C(1000000000) / freq); \
> +   (Diff) = (((End) - (Start)) * UINT64_C(1000000000)) / freq; \
> })
>  #endif /* hp-timing.h */
> ```


--
Cheers,
Carlos.
  
DJ Delorie Jan. 31, 2023, 11:14 p.m. UTC | #3
Something was stripping leading spaces off the "context" lines.  The
attached-as-file patch was unaffected.  However, because this was a
"Re:" email, it wasn't considered as a new patch in patchwork, but
instead attached to the corrupted patch's series.

So please re-send as a new message to the list, without the "Re:" or
Reply-to headers, with the patch attached as a file, and it should work.

If not, we'll keep trying to make it work :-)

"Tang, Jun" <juntangc@amazon.com> writes:
>> diff --git a/sysdeps/aarch64/hp-timing.h b/sysdeps/aarch64/hp-timing.h 
>> index f7f7ac7cae..c699effe6a 100644
>> --- a/sysdeps/aarch64/hp-timing.h
>> +++ b/sysdeps/aarch64/hp-timing.h
>> @@ -41,7 +41,7 @@ typedef uint64_t hp_timing_t;
>> #define HP_TIMING_DIFF(Diff, Start, End)                       \
>> ({  hp_timing_t freq;                                          \
>>      __asm__ __volatile__ ("mrs %0, cntfrq_el0" : "=r" (freq)); \
>> -   (Diff) = ((End) - (Start)) * (UINT64_C(1000000000) / freq); \
>> +   (Diff) = (((End) - (Start)) * UINT64_C(1000000000)) / freq; \
>> })
>>  #endif /* hp-timing.h */
  
develop--- via Libc-alpha Jan. 31, 2023, 11:16 p.m. UTC | #4
That's good to know.  Thank you,

-----Original Message-----
From: DJ Delorie <dj@redhat.com> 
Sent: Tuesday, January 31, 2023 5:15 PM
To: Tang, Jun <juntangc@amazon.com>
Cc: carlos@redhat.com; libc-alpha@sourceware.org
Subject: RE: [EXTERNAL]revised patch for hp-timing.h

CAUTION: This email originated from outside of the organization. Do not click links or open attachments unless you can confirm the sender and know the content is safe.



Something was stripping leading spaces off the "context" lines.  The attached-as-file patch was unaffected.  However, because this was a "Re:" email, it wasn't considered as a new patch in patchwork, but instead attached to the corrupted patch's series.

So please re-send as a new message to the list, without the "Re:" or Reply-to headers, with the patch attached as a file, and it should work.

If not, we'll keep trying to make it work :-)

"Tang, Jun" <juntangc@amazon.com> writes:
>> diff --git a/sysdeps/aarch64/hp-timing.h 
>> b/sysdeps/aarch64/hp-timing.h index f7f7ac7cae..c699effe6a 100644
>> --- a/sysdeps/aarch64/hp-timing.h
>> +++ b/sysdeps/aarch64/hp-timing.h
>> @@ -41,7 +41,7 @@ typedef uint64_t hp_timing_t;
>> #define HP_TIMING_DIFF(Diff, Start, End)                       \
>> ({  hp_timing_t freq;                                          \
>>      __asm__ __volatile__ ("mrs %0, cntfrq_el0" : "=r" (freq)); \
>> -   (Diff) = ((End) - (Start)) * (UINT64_C(1000000000) / freq); \
>> +   (Diff) = (((End) - (Start)) * UINT64_C(1000000000)) / freq; \
>> })
>>  #endif /* hp-timing.h */
  

Patch

diff --git a/sysdeps/aarch64/hp-timing.h b/sysdeps/aarch64/hp-timing.h
index f7f7ac7cae..c699effe6a 100644
--- a/sysdeps/aarch64/hp-timing.h
+++ b/sysdeps/aarch64/hp-timing.h
@@ -41,7 +41,7 @@  typedef uint64_t hp_timing_t;
#define HP_TIMING_DIFF(Diff, Start, End)                       \
({  hp_timing_t freq;                                          \
     __asm__ __volatile__ ("mrs %0, cntfrq_el0" : "=r" (freq)); \
-   (Diff) = ((End) - (Start)) * (UINT64_C(1000000000) / freq); \
+   (Diff) = (((End) - (Start)) * UINT64_C(1000000000)) / freq; \
})
 #endif /* hp-timing.h */
```