This is an archive of the discontinued LLVM Phabricator instance.

Differential D82050

[flang] Fixes build problems stemming from changes to cmake files
ClosedPublic

Authored by schweitz on Jun 17 2020, 1:16 PM.

Details

Reviewers
tskeith
PeteSteinfeld
sscalpone
jdoerfert
DavidTruby
Commits
rGb46e2548b67d: [flang] Fix fallout from varous changes to the cmake files.
Summary

Recent target, etc. changes to the cmake files broke the flang builds.

Diff Detail

Event Timeline

schweitz created this revision.Jun 17 2020, 1:16 PM
Herald added a reviewer: jdoerfert. · View Herald TranscriptJun 17 2020, 1:16 PM
Herald added a reviewer: DavidTruby. · View Herald Transcript
Herald added a project: Restricted Project. · View Herald Transcript
Herald added subscribers: llvm-commits, mgorny. · View Herald Transcript
Harbormaster failed remote builds in B60695: Diff 271463!Jun 17 2020, 1:30 PM
schweitz updated this revision to Diff 271477.Jun 17 2020, 2:06 PM

Resolve new conflicts.

PeteSteinfeld accepted this revision.Jun 17 2020, 2:30 PM

Everything builds and tests correctly for me.

This revision is now accepted and ready to land.Jun 17 2020, 2:30 PM
tskeith accepted this revision.Jun 17 2020, 2:55 PM
Closed by commit rGb46e2548b67d: [flang] Fix fallout from varous changes to the cmake files. (authored by schweitz). · Explain WhyJun 17 2020, 3:07 PM
This revision was automatically updated to reflect the committed changes.
PeteSteinfeld mentioned this in D82054: [flang] More Fortran runtime support for CHARACTER operations.Jun 17 2020, 3:36 PM

Revision Contents

PathSize
flang/
lib/
Lower/
14 lines
Optimizer/
28 lines
Dialect/
Support/
tools/
tco/
3 lines
unittests/
Optimizer/
2 lines

Diff 271477

flang/lib/Lower/CMakeLists.txt

set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error -Wno-unused-parameter") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error -Wno-unused-parameter")
get_property(dialect_libs GLOBAL PROPERTY MLIR_DIALECT_LIBS)
add_flang_library(FortranLower add_flang_library(FortranLower
ComplexExpr.cpp ComplexExpr.cpp
ConvertType.cpp ConvertType.cpp
DoLoopHelper.cpp DoLoopHelper.cpp
Mangler.cpp Mangler.cpp
OpenMP.cpp OpenMP.cpp
PFTBuilder.cpp PFTBuilder.cpp
DEPENDS DEPENDS
FIROpsIncGen FIROptimizer
MLIRControlFlowInterfaces ${dialect_libs}
MLIRLinalgOps
LINK_LIBS
FIROptimizer
${dialect_libs}
MLIRAffineToStandard
MLIRLLVMIR
MLIRSCFToStandard
MLIRStandardOps
LINK_COMPONENTS LINK_COMPONENTS
Support Support
) )

flang/lib/Optimizer/CMakeLists.txt

add_subdirectory(Dialect) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-parameter -Wno-error")
add_subdirectory(Support) get_property(dialect_libs GLOBAL PROPERTY MLIR_DIALECT_LIBS)
add_flang_library(FIROptimizer
Dialect/FIRAttr.cpp
Dialect/FIRDialect.cpp
Dialect/FIROps.cpp
Dialect/FIRType.cpp
Support/InternalNames.cpp
Support/KindMapping.cpp
DEPENDS
FIROpsIncGen
${dialect_libs}
LINK_LIBS
${dialect_libs}
MLIRTargetLLVMIR
MLIRTargetLLVMIRModuleTranslation
LINK_COMPONENTS
AsmParser
AsmPrinter
Remarks
)

flang/lib/Optimizer/Dialect/CMakeLists.txt

  • This file was deleted.
get_property(dialect_libs GLOBAL PROPERTY MLIR_DIALECT_LIBS)
add_flang_library(FIRDialect
FIRAttr.cpp
FIRDialect.cpp
FIROps.cpp
FIRType.cpp
DEPENDS
FIROpsIncGen
${dialect_libs}
LINK_LIBS
FIRSupport
MLIRTargetLLVMIR
MLIRTargetLLVMIRModuleTranslation
MLIREDSC
MLIRExecutionEngine
MLIRParser
MLIRSupport
MLIRStandardToLLVM
MLIRTransforms
LINK_COMPONENTS
AsmParser
AsmPrinter
Remarks
)

flang/lib/Optimizer/Support/CMakeLists.txt

  • This file was deleted.
get_property(dialect_libs GLOBAL PROPERTY MLIR_DIALECT_LIBS)
add_flang_library(FIRSupport
InternalNames.cpp
KindMapping.cpp
DEPENDS
${dialect_libs}
LINK_LIBS
${dialect_libs}
)

flang/tools/tco/CMakeLists.txt

get_property(dialect_libs GLOBAL PROPERTY MLIR_DIALECT_LIBS) get_property(dialect_libs GLOBAL PROPERTY MLIR_DIALECT_LIBS)
set(LIBS set(LIBS
FIRDialect FIROptimizer
FIRSupport
${dialect_libs} ${dialect_libs}
MLIRIR MLIRIR
MLIRLLVMIR MLIRLLVMIR
MLIRPass MLIRPass
MLIRStandardToLLVM MLIRStandardToLLVM
MLIRTransforms MLIRTransforms
MLIRAffineToStandard MLIRAffineToStandard
MLIRAnalysis MLIRAnalysis
Show All 10 Lines

flang/unittests/Optimizer/CMakeLists.txt

get_property(dialect_libs GLOBAL PROPERTY MLIR_DIALECT_LIBS) get_property(dialect_libs GLOBAL PROPERTY MLIR_DIALECT_LIBS)
set(LIBS set(LIBS
FIRDialect FIROptimizer
${dialect_libs} ${dialect_libs}
) )
add_flang_unittest(FlangOptimizerTests add_flang_unittest(FlangOptimizerTests
InternalNamesTest.cpp InternalNamesTest.cpp
) )
target_link_libraries(FlangOptimizerTests target_link_libraries(FlangOptimizerTests
PRIVATE PRIVATE
${LIBS}) ${LIBS})
flang/lib/Optimizer/Dialect/CMakeLists.txt