Skip to content

Commit 21f46a5

Browse files
lamb-jlamb-j
authored
[Comgr][NFC] fix formatting (llvm#1249)
2 parents 4d3bc2b + 54131e9 commit 21f46a5

File tree

9 files changed

+35
-32
lines changed

9 files changed

+35
-32
lines changed

‎amd/comgr/src/comgr-compiler.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1945,8 +1945,8 @@ amd_comgr_status_t AMDGPUCompiler::translateSpirvToBitcode() {
19451945

19461946
if (env::shouldEmitVerboseLogs()) {
19471947
LogS << "SPIR-V Translation: amd-llvm-spirv -r --spirv-target-env=CL2.0 "
1948-
<< getFilePath(Input, InputDir) << " "
1949-
<< getFilePath(Output, OutputDir) << " (command line equivalent)\n";
1948+
<< getFilePath(Input, InputDir) << " "
1949+
<< getFilePath(Output, OutputDir) << " (command line equivalent)\n";
19501950
}
19511951

19521952
if (env::shouldSaveTemps()) {

‎amd/comgr/src/comgr-device-libs.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,9 @@ amd_comgr_status_t addObject(DataSet *DataSet, amd_comgr_data_kind_t Kind,
6666
#include "opencl2.0-c.inc"
6767
} // namespace
6868

69-
ArrayRef<unsigned char> getDeviceLibrariesIdentifier() { return DEVICE_LIBS_ID; }
69+
ArrayRef<unsigned char> getDeviceLibrariesIdentifier() {
70+
return DEVICE_LIBS_ID;
71+
}
7072

7173
amd_comgr_status_t addPrecompiledHeaders(DataAction *ActionInfo,
7274
DataSet *ResultSet) {

‎amd/comgr/test-lit/comgr-sources/common.h

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,24 +10,24 @@
1010

1111
#if !defined(_WIN32) && !defined(_WIN64)
1212
#include <sys/stat.h>
13-
#include <sys/types.h>
1413
#include <sys/syscall.h>
14+
#include <sys/types.h>
1515
#include <unistd.h>
1616
#else // Windows
1717
#include <io.h>
1818
#endif
1919
#include <errno.h>
2020
#include <fcntl.h>
2121

22-
#define amd_comgr_(call) \
23-
do { \
24-
amd_comgr_status_t status = amd_comgr_ ## call; \
25-
if (status != AMD_COMGR_STATUS_SUCCESS) { \
26-
const char* reason = ""; \
27-
amd_comgr_status_string(status, &reason); \
28-
fail(#call " failed: %s\n file, line: %s, %d\n", \
29-
reason, __FILE__, __LINE__); \
30-
} \
22+
#define amd_comgr_(call) \
23+
do { \
24+
amd_comgr_status_t status = amd_comgr_##call; \
25+
if (status != AMD_COMGR_STATUS_SUCCESS) { \
26+
const char *reason = ""; \
27+
amd_comgr_status_string(status, &reason); \
28+
fail(#call " failed: %s\n file, line: %s, %d\n", reason, __FILE__, \
29+
__LINE__); \
30+
} \
3131
} while (false)
3232

3333
static void fail(const char *format, ...) {
@@ -58,7 +58,7 @@ static int setBuf(const char *infile, char **buf) {
5858
if (fseek(fp, 0, SEEK_SET) != 0)
5959
fail("fseek");
6060

61-
*buf = (char *) malloc(size + 1);
61+
*buf = (char *)malloc(size + 1);
6262
if (!*buf)
6363
fail("malloc");
6464
if (fread(*buf, size, 1, fp) != 1)

‎amd/comgr/test-lit/comgr-sources/source-to-bc-with-dev-libs.c

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,13 @@ int main(int argc, char *argv[]) {
1010
amd_comgr_data_t DataSource;
1111
amd_comgr_data_set_t DataSetIn, DataSetPch, DataSetBc;
1212
amd_comgr_action_info_t DataAction;
13-
const char *CodeGenOptions[] = {
14-
"-mcode-object-version=5", "-mllvm", "-amdgpu-prelink"};
13+
const char *CodeGenOptions[] = {"-mcode-object-version=5", "-mllvm",
14+
"-amdgpu-prelink"};
1515
size_t CodeGenOptionsCount =
1616
sizeof(CodeGenOptions) / sizeof(CodeGenOptions[0]);
1717
if (argc != 4) {
18-
fprintf(stderr, "Usage: source-to-bc-with-device-libs file.cl -o file.bc\n");
18+
fprintf(stderr,
19+
"Usage: source-to-bc-with-device-libs file.cl -o file.bc\n");
1920
exit(1);
2021
}
2122

@@ -28,13 +29,13 @@ int main(int argc, char *argv[]) {
2829
amd_comgr_(data_set_add(DataSetIn, DataSource));
2930

3031
amd_comgr_(create_action_info(&DataAction));
31-
amd_comgr_(action_info_set_language(DataAction,
32-
AMD_COMGR_LANGUAGE_OPENCL_1_2));
32+
amd_comgr_(
33+
action_info_set_language(DataAction, AMD_COMGR_LANGUAGE_OPENCL_1_2));
3334
amd_comgr_(action_info_set_isa_name(DataAction, "amdgcn-amd-amdhsa--gfx900"));
3435
amd_comgr_(create_data_set(&DataSetPch));
3536

3637
amd_comgr_(do_action(AMD_COMGR_ACTION_ADD_PRECOMPILED_HEADERS, DataAction,
37-
DataSetIn, DataSetPch));
38+
DataSetIn, DataSetPch));
3839

3940
size_t Count;
4041
amd_comgr_(action_data_count(DataSetPch,
@@ -49,7 +50,7 @@ int main(int argc, char *argv[]) {
4950

5051
amd_comgr_(create_data_set(&DataSetBc));
5152
amd_comgr_(action_info_set_option_list(DataAction, CodeGenOptions,
52-
CodeGenOptionsCount));
53+
CodeGenOptionsCount));
5354
amd_comgr_(do_action(AMD_COMGR_ACTION_COMPILE_SOURCE_WITH_DEVICE_LIBS_TO_BC,
5455
DataAction, DataSetPch, DataSetBc));
5556

@@ -63,8 +64,8 @@ int main(int argc, char *argv[]) {
6364
}
6465

6566
amd_comgr_data_t DataBc;
66-
amd_comgr_(action_data_get_data(DataSetBc, AMD_COMGR_DATA_KIND_BC, 0,
67-
&DataBc));
67+
amd_comgr_(
68+
action_data_get_data(DataSetBc, AMD_COMGR_DATA_KIND_BC, 0, &DataBc));
6869
dumpData(DataBc, argv[3]);
6970

7071
amd_comgr_(release_data(DataSource));

‎amd/comgr/test-lit/comgr-sources/spirv-translator.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ int main(int argc, char *argv[]) {
3131
amd_comgr_(create_action_info(&DataAction));
3232
amd_comgr_(create_data_set(&DataSetBc));
3333

34-
amd_comgr_(do_action(AMD_COMGR_ACTION_TRANSLATE_SPIRV_TO_BC,
35-
DataAction, DataSetSpirv, DataSetBc));
34+
amd_comgr_(do_action(AMD_COMGR_ACTION_TRANSLATE_SPIRV_TO_BC, DataAction,
35+
DataSetSpirv, DataSetBc));
3636

3737
amd_comgr_(action_data_count(DataSetBc, AMD_COMGR_DATA_KIND_BC, &Count));
3838

@@ -46,8 +46,8 @@ int main(int argc, char *argv[]) {
4646
// Write bitcode to file
4747
amd_comgr_data_t DataSpirvBc;
4848

49-
amd_comgr_(action_data_get_data(
50-
DataSetBc, AMD_COMGR_DATA_KIND_BC, 0, &DataSpirvBc));
49+
amd_comgr_(
50+
action_data_get_data(DataSetBc, AMD_COMGR_DATA_KIND_BC, 0, &DataSpirvBc));
5151

5252
dumpData(DataSpirvBc, argv[3]);
5353

‎amd/comgr/test/compile_hip_test.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ int main(int Argc, char *Argv[]) {
4949
amd_comgr_status_t Status;
5050
const char *CompileOptions[] = {"-nogpulib", "-nogpuinc"};
5151
size_t CompileOptionsCount =
52-
sizeof(CompileOptions) / sizeof(CompileOptions[0]);
52+
sizeof(CompileOptions) / sizeof(CompileOptions[0]);
5353

5454
SizeSource = setBuf(TEST_OBJ_DIR "/source1.hip", &BufSource);
5555

‎amd/comgr/test/compile_hip_to_relocatable.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ int main(int argc, char *argv[]) {
4747
amd_comgr_action_info_t DataAction;
4848
amd_comgr_status_t Status;
4949
const char *CompileOptions[] = {"-fno-slp-vectorize", "-nogpulib",
50-
"-nogpuinc"};
50+
"-nogpuinc"};
5151
size_t CompileOptionsCount =
52-
sizeof(CompileOptions) / sizeof(CompileOptions[0]);
52+
sizeof(CompileOptions) / sizeof(CompileOptions[0]);
5353

5454
SizeSource = setBuf(TEST_OBJ_DIR "/source1.hip", &BufSource);
5555

‎amd/comgr/test/mangled_names_hip_test.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ int main(int argc, char *argv[]) {
5050
size_t Count;
5151
const char *CompileOptions[] = {"-nogpulib", "-nogpuinc"};
5252
size_t CompileOptionsCount =
53-
sizeof(CompileOptions) / sizeof(CompileOptions[0]);
53+
sizeof(CompileOptions) / sizeof(CompileOptions[0]);
5454

5555
SizeSource = setBuf(TEST_OBJ_DIR "/source1.hip", &BufSource);
5656

‎amd/comgr/test/name_expression_map_test.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ int main(int argc, char *argv[]) {
5050
size_t Count;
5151
const char *CompileOptions[] = {"-nogpulib", "-nogpuinc"};
5252
size_t CompileOptionsCount =
53-
sizeof(CompileOptions) / sizeof(CompileOptions[0]);
53+
sizeof(CompileOptions) / sizeof(CompileOptions[0]);
5454

5555
SizeSource = setBuf(TEST_OBJ_DIR "/name-expression.hip", &BufSource);
5656

0 commit comments

Comments
 (0)