This is an archive of the discontinued LLVM Phabricator instance.

Differential D52181

[benchmark] Lowercase windows specific includes
ClosedPublic

Authored by mstorsjo on Sep 17 2018, 11:37 AM.

Details

Reviewers
smeenai
rnk
kbobyrev
lebedev.ri
Commits
rGa4edfcb2a40e: [benchmark] Lowercase windows specific includes
rL342450: [benchmark] Lowercase windows specific includes
Summary

The windows SDK headers don't have self-consistent casing anyway, so we consistently use lowercase for these in other places, in order to fix crosscompilation with mingw headers.

Diff Detail

Repository
rL LLVM

Event Timeline

mstorsjo created this revision.Sep 17 2018, 11:37 AM
lebedev.ri added a reviewer: lebedev.ri.Sep 17 2018, 11:40 AM
lebedev.ri added a subscriber: lebedev.ri.

Would be great if this could go upstream first, and then backported.

lebedev.ri accepted this revision.Sep 18 2018, 1:43 AM

LG

This revision is now accepted and ready to land.Sep 18 2018, 1:43 AM
Closed by commit rL342450: [benchmark] Lowercase windows specific includes (authored by mstorsjo). · Explain WhySep 18 2018, 1:46 AM
This revision was automatically updated to reflect the committed changes.
kbobyrev added a comment.Sep 18 2018, 11:52 AM

Hi!

Sorry, I missed the patch when it was uploaded. It might make sense to mention the upstream revision in README.LLVM (within benchmark folder in the LLVM source tree), so that it's easy to understand that this change was also applied upstream. I can do that, though, no worries.

Thanks for fixing the issue!

mstorsjo added a comment.Sep 18 2018, 12:33 PM
In D52181#1238676, @kbobyrev wrote:

Hi!

Sorry, I missed the patch when it was uploaded. It might make sense to mention the upstream revision in README.LLVM (within benchmark folder in the LLVM source tree), so that it's easy to understand that this change was also applied upstream. I can do that, though, no worries.

Ah, I hadn't noticed that there was such a file there. I added the reference to the cherry-picked commit there now as well.

kbobyrev added a comment.Sep 18 2018, 12:39 PM
In D52181#1238712, @mstorsjo wrote:
In D52181#1238676, @kbobyrev wrote:

Hi!

Sorry, I missed the patch when it was uploaded. It might make sense to mention the upstream revision in README.LLVM (within benchmark folder in the LLVM source tree), so that it's easy to understand that this change was also applied upstream. I can do that, though, no worries.

Ah, I hadn't noticed that there was such a file there. I added the reference to the cherry-picked commit there now as well.

Great, thank you very much!

Revision Contents

PathSize
llvm/
trunk/
utils/
benchmark/
src/
2 lines
2 lines
6 lines
6 lines

Diff 165905

llvm/trunk/utils/benchmark/src/colorprint.cc

Show All 19 Lines
#include <cstring> #include <cstring>
#include <memory> #include <memory>
#include <string> #include <string>
#include "check.h" #include "check.h"
#include "internal_macros.h" #include "internal_macros.h"
#ifdef BENCHMARK_OS_WINDOWS #ifdef BENCHMARK_OS_WINDOWS
#include <Windows.h> #include <windows.h>
#include <io.h> #include <io.h>
#else #else
#include <unistd.h> #include <unistd.h>
#endif // BENCHMARK_OS_WINDOWS #endif // BENCHMARK_OS_WINDOWS
namespace benchmark { namespace benchmark {
namespace { namespace {
#ifdef BENCHMARK_OS_WINDOWS #ifdef BENCHMARK_OS_WINDOWS
▲ Show 20 Lines • Show All 152 Lines • Show Last 20 Lines

llvm/trunk/utils/benchmark/src/sleep.cc

Show All 15 Lines
#include <cerrno> #include <cerrno>
#include <cstdlib> #include <cstdlib>
#include <ctime> #include <ctime>
#include "internal_macros.h" #include "internal_macros.h"
#ifdef BENCHMARK_OS_WINDOWS #ifdef BENCHMARK_OS_WINDOWS
#include <Windows.h> #include <windows.h>
#endif #endif
namespace benchmark { namespace benchmark {
#ifdef BENCHMARK_OS_WINDOWS #ifdef BENCHMARK_OS_WINDOWS
// Window's Sleep takes milliseconds argument. // Window's Sleep takes milliseconds argument.
void SleepForMilliseconds(int milliseconds) { Sleep(milliseconds); } void SleepForMilliseconds(int milliseconds) { Sleep(milliseconds); }
void SleepForSeconds(double seconds) { void SleepForSeconds(double seconds) {
SleepForMilliseconds(static_cast<int>(kNumMillisPerSecond * seconds)); SleepForMilliseconds(static_cast<int>(kNumMillisPerSecond * seconds));
Show All 19 Lines

llvm/trunk/utils/benchmark/src/sysinfo.cc

Show All 9 Lines
// distributed under the License is distributed on an "AS IS" BASIS, // distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
#include "internal_macros.h" #include "internal_macros.h"
#ifdef BENCHMARK_OS_WINDOWS #ifdef BENCHMARK_OS_WINDOWS
#include <Shlwapi.h> #include <shlwapi.h>
#undef StrCat // Don't let StrCat in string_util.h be renamed to lstrcatA #undef StrCat // Don't let StrCat in string_util.h be renamed to lstrcatA
#include <VersionHelpers.h> #include <versionhelpers.h>
#include <Windows.h> #include <windows.h>
#else #else
#include <fcntl.h> #include <fcntl.h>
#ifndef BENCHMARK_OS_FUCHSIA #ifndef BENCHMARK_OS_FUCHSIA
#include <sys/resource.h> #include <sys/resource.h>
#endif #endif
#include <sys/time.h> #include <sys/time.h>
#include <sys/types.h> // this header must be included before 'sys/sysctl.h' to avoid compilation error on FreeBSD #include <sys/types.h> // this header must be included before 'sys/sysctl.h' to avoid compilation error on FreeBSD
#include <unistd.h> #include <unistd.h>
▲ Show 20 Lines • Show All 558 Lines • Show Last 20 Lines

llvm/trunk/utils/benchmark/src/timers.cc

Show All 10 Lines
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
#include "timers.h" #include "timers.h"
#include "internal_macros.h" #include "internal_macros.h"
#ifdef BENCHMARK_OS_WINDOWS #ifdef BENCHMARK_OS_WINDOWS
#include <Shlwapi.h> #include <shlwapi.h>
#undef StrCat // Don't let StrCat in string_util.h be renamed to lstrcatA #undef StrCat // Don't let StrCat in string_util.h be renamed to lstrcatA
#include <VersionHelpers.h> #include <versionhelpers.h>
#include <Windows.h> #include <windows.h>
#else #else
#include <fcntl.h> #include <fcntl.h>
#ifndef BENCHMARK_OS_FUCHSIA #ifndef BENCHMARK_OS_FUCHSIA
#include <sys/resource.h> #include <sys/resource.h>
#endif #endif
#include <sys/time.h> #include <sys/time.h>
#include <sys/types.h> // this header must be included before 'sys/sysctl.h' to avoid compilation error on FreeBSD #include <sys/types.h> // this header must be included before 'sys/sysctl.h' to avoid compilation error on FreeBSD
#include <unistd.h> #include <unistd.h>
▲ Show 20 Lines • Show All 187 Lines • Show Last 20 Lines